[Renderscript] Clang-format the renderscript plugin.

Run clang-format over the renderscript plugin and fix common formatting deviations.

llvm-svn: 259056

1 files changed, 654 insertions, 651 deletions

diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
index 471acad4eeb..6bec25428f3 100644
--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@@ -13,50 +13,49 @@
 // Project includes
 #include "RenderScriptRuntime.h"
 
+#include "lldb/Breakpoint/StoppointCallbackContext.h"
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/PluginManager.h"
-#include "lldb/Core/ValueObjectVariable.h"
 #include "lldb/Core/RegularExpression.h"
+#include "lldb/Core/ValueObjectVariable.h"
 #include "lldb/DataFormatters/DumpValueObjectOptions.h"
+#include "lldb/Expression/UserExpression.h"
 #include "lldb/Host/StringConvert.h"
+#include "lldb/Interpreter/Args.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Interpreter/CommandObjectMultiword.h"
+#include "lldb/Interpreter/CommandReturnObject.h"
+#include "lldb/Interpreter/Options.h"
 #include "lldb/Symbol/Symbol.h"
 #include "lldb/Symbol/Type.h"
+#include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
-#include "lldb/Interpreter/Args.h"
-#include "lldb/Interpreter/Options.h"
-#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Interpreter/CommandReturnObject.h"
-#include "lldb/Interpreter/CommandObjectMultiword.h"
-#include "lldb/Breakpoint/StoppointCallbackContext.h"
-#include "lldb/Target/RegisterContext.h"
-#include "lldb/Expression/UserExpression.h"
-#include "lldb/Symbol/VariableList.h"
 
 using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_renderscript;
 
-namespace {
+namespace
+{
 
 // The empirical_type adds a basic level of validation to arbitrary data
 // allowing us to track if data has been discovered and stored or not.
 // An empirical_type will be marked as valid only if it has been explicitly assigned to.
-template <typename type_t>
-class empirical_type
+template <typename type_t> class empirical_type
 {
 public:
     // Ctor. Contents is invalid when constructed.
-    empirical_type()
-        : valid(false)
-    {}
+    empirical_type() : valid(false) {}
 
     // Return true and copy contents to out if valid, else return false.
-    bool get(type_t& out) const
+    bool
+    get(type_t &out) const
     {
         if (valid)
             out = data;
@@ -64,32 +63,37 @@ public:
     }
 
     // Return a pointer to the contents or nullptr if it was not valid.
-    const type_t* get() const
+    const type_t *
+    get() const
     {
         return valid ? &data : nullptr;
     }
 
     // Assign data explicitly.
-    void set(const type_t in)
+    void
+    set(const type_t in)
     {
         data = in;
         valid = true;
     }
 
     // Mark contents as invalid.
-    void invalidate()
+    void
+    invalidate()
     {
         valid = false;
     }
 
     // Returns true if this type contains valid data.
-    bool isValid() const
+    bool
+    isValid() const
     {
         return valid;
     }
 
     // Assignment operator.
-    empirical_type<type_t>& operator = (const type_t in)
+    empirical_type<type_t> &
+    operator=(const type_t in)
     {
         set(in);
         return *this;
@@ -97,7 +101,7 @@ public:
 
     // Dereference operator returns contents.
     // Warning: Will assert if not valid so use only when you know data is valid.
-    const type_t& operator * () const
+    const type_t &operator*() const
     {
         assert(valid);
         return data;
@@ -193,21 +197,23 @@ struct RenderScriptRuntime::Element
         RS_TYPE_INVALID = 10000
     };
 
-    std::vector<Element> children;                       // Child Element fields for structs
-    empirical_type<lldb::addr_t> element_ptr;            // Pointer to the RS Element of the Type
-    empirical_type<DataType> type;                       // Type of each data pointer stored by the allocation
-    empirical_type<DataKind> type_kind;                  // Defines pixel type if Allocation is created from an image
-    empirical_type<uint32_t> type_vec_size;              // Vector size of each data point, e.g '4' for uchar4
-    empirical_type<uint32_t> field_count;                // Number of Subelements
-    empirical_type<uint32_t> datum_size;                 // Size of a single Element with padding
-    empirical_type<uint32_t> padding;                    // Number of padding bytes
-    empirical_type<uint32_t> array_size;                 // Number of items in array, only needed for strucrs
-    ConstString type_name;                               // Name of type, only needed for structs
-
-    static const ConstString &GetFallbackStructName();   // Print this as the type name of a struct Element
-                                                         // If we can't resolve the actual struct name
+    std::vector<Element> children;            // Child Element fields for structs
+    empirical_type<lldb::addr_t> element_ptr; // Pointer to the RS Element of the Type
+    empirical_type<DataType> type;            // Type of each data pointer stored by the allocation
+    empirical_type<DataKind> type_kind;       // Defines pixel type if Allocation is created from an image
+    empirical_type<uint32_t> type_vec_size;   // Vector size of each data point, e.g '4' for uchar4
+    empirical_type<uint32_t> field_count;     // Number of Subelements
+    empirical_type<uint32_t> datum_size;      // Size of a single Element with padding
+    empirical_type<uint32_t> padding;         // Number of padding bytes
+    empirical_type<uint32_t> array_size;      // Number of items in array, only needed for strucrs
+    ConstString type_name;                    // Name of type, only needed for structs
+
+    static const ConstString &
+    GetFallbackStructName(); // Print this as the type name of a struct Element
+                             // If we can't resolve the actual struct name
 
-    bool shouldRefresh() const
+    bool
+    shouldRefresh() const
     {
         const bool valid_ptr = element_ptr.isValid() && *element_ptr.get() != 0x0;
         const bool valid_type = type.isValid() && type_vec_size.isValid() && type_kind.isValid();
@@ -228,10 +234,10 @@ struct RenderScriptRuntime::AllocationDetails
 
         Dimension()
         {
-             dim_1 = 0;
-             dim_2 = 0;
-             dim_3 = 0;
-             cubeMap = 0;
+            dim_1 = 0;
+            dim_2 = 0;
+            dim_3 = 0;
+            cubeMap = 0;
         }
     };
 
@@ -245,52 +251,51 @@ struct RenderScriptRuntime::AllocationDetails
     // These offsets are 4 bytes in size, and the 0 offset signifies no more children.
     struct FileHeader
     {
-        uint8_t ident[4];      // ASCII 'RSAD' identifying the file
-        uint32_t dims[3];      // Dimensions
-        uint16_t hdr_size;     // Header size in bytes, including all element headers
+        uint8_t ident[4];  // ASCII 'RSAD' identifying the file
+        uint32_t dims[3];  // Dimensions
+        uint16_t hdr_size; // Header size in bytes, including all element headers
     };
 
     struct ElementHeader
     {
-        uint16_t type;          // DataType enum
-        uint32_t kind;          // DataKind enum
-        uint32_t element_size;  // Size of a single element, including padding
-        uint16_t vector_size;   // Vector width
-        uint32_t array_size;    // Number of elements in array
+        uint16_t type;         // DataType enum
+        uint32_t kind;         // DataKind enum
+        uint32_t element_size; // Size of a single element, including padding
+        uint16_t vector_size;  // Vector width
+        uint32_t array_size;   // Number of elements in array
     };
 
     // Monotonically increasing from 1
-    static unsigned int ID;
+    static uint32_t ID;
 
     // Maps Allocation DataType enum and vector size to printable strings
     // using mapping from RenderScript numerical types summary documentation
-    static const char* RsDataTypeToString[][4];
+    static const char *RsDataTypeToString[][4];
 
     // Maps Allocation DataKind enum to printable strings
-    static const char* RsDataKindToString[];
+    static const char *RsDataKindToString[];
 
     // Maps allocation types to format sizes for printing.
-    static const unsigned int RSTypeToFormat[][3];
+    static const uint32_t RSTypeToFormat[][3];
 
     // Give each allocation an ID as a way
     // for commands to reference it.
-    const unsigned int id;
+    const uint32_t id;
 
-    RenderScriptRuntime::Element element;     // Allocation Element type
-    empirical_type<Dimension> dimension;      // Dimensions of the Allocation
-    empirical_type<lldb::addr_t> address;     // Pointer to address of the RS Allocation
-    empirical_type<lldb::addr_t> data_ptr;    // Pointer to the data held by the Allocation
-    empirical_type<lldb::addr_t> type_ptr;    // Pointer to the RS Type of the Allocation
-    empirical_type<lldb::addr_t> context;     // Pointer to the RS Context of the Allocation
-    empirical_type<uint32_t> size;            // Size of the allocation
-    empirical_type<uint32_t> stride;          // Stride between rows of the allocation
+    RenderScriptRuntime::Element element;  // Allocation Element type
+    empirical_type<Dimension> dimension;   // Dimensions of the Allocation
+    empirical_type<lldb::addr_t> address;  // Pointer to address of the RS Allocation
+    empirical_type<lldb::addr_t> data_ptr; // Pointer to the data held by the Allocation
+    empirical_type<lldb::addr_t> type_ptr; // Pointer to the RS Type of the Allocation
+    empirical_type<lldb::addr_t> context;  // Pointer to the RS Context of the Allocation
+    empirical_type<uint32_t> size;         // Size of the allocation
+    empirical_type<uint32_t> stride;       // Stride between rows of the allocation
 
     // Give each allocation an id, so we can reference it in user commands.
-    AllocationDetails(): id(ID++)
-    {
-    }
+    AllocationDetails() : id(ID++) {}
 
-    bool shouldRefresh() const
+    bool
+    shouldRefresh() const
     {
         bool valid_ptrs = data_ptr.isValid() && *data_ptr.get() != 0x0;
         valid_ptrs = valid_ptrs && type_ptr.isValid() && *type_ptr.get() != 0x0;
@@ -305,24 +310,15 @@ RenderScriptRuntime::Element::GetFallbackStructName()
     return FallbackStructName;
 }
 
-unsigned int RenderScriptRuntime::AllocationDetails::ID = 1;
+uint32_t RenderScriptRuntime::AllocationDetails::ID = 1;
 
-const char* RenderScriptRuntime::AllocationDetails::RsDataKindToString[] =
-{
-   "User",
-   "Undefined", "Undefined", "Undefined", // Enum jumps from 0 to 7
-   "Undefined", "Undefined", "Undefined",
-   "L Pixel",
-   "A Pixel",
-   "LA Pixel",
-   "RGB Pixel",
-   "RGBA Pixel",
-   "Pixel Depth",
-   "YUV Pixel"
-};
+const char *RenderScriptRuntime::AllocationDetails::RsDataKindToString[] = {
+    "User",
+    "Undefined",  "Undefined",   "Undefined", "Undefined", "Undefined",  "Undefined", // Enum jumps from 0 to 7
+    "L Pixel",    "A Pixel",     "LA Pixel",  "RGB Pixel",
+    "RGBA Pixel", "Pixel Depth", "YUV Pixel"};
 
-const char* RenderScriptRuntime::AllocationDetails::RsDataTypeToString[][4] =
-{
+const char *RenderScriptRuntime::AllocationDetails::RsDataTypeToString[][4] = {
     {"None", "None", "None", "None"},
     {"half", "half2", "half3", "half4"},
     {"float", "float2", "float3", "float4"},
@@ -356,38 +352,37 @@ const char* RenderScriptRuntime::AllocationDetails::RsDataTypeToString[][4] =
     {"RS Program Vertex", "RS Program Vertex", "RS Program Vertex", "RS Program Vertex"},
     {"RS Program Raster", "RS Program Raster", "RS Program Raster", "RS Program Raster"},
     {"RS Program Store", "RS Program Store", "RS Program Store", "RS Program Store"},
-    {"RS Font", "RS Font", "RS Font", "RS Font"}
-};
+    {"RS Font", "RS Font", "RS Font", "RS Font"}};
 
 // Used as an index into the RSTypeToFormat array elements
-enum TypeToFormatIndex {
-   eFormatSingle = 0,
-   eFormatVector,
-   eElementSize
+enum TypeToFormatIndex
+{
+    eFormatSingle = 0,
+    eFormatVector,
+    eElementSize
 };
 
 // { format enum of single element, format enum of element vector, size of element}
-const unsigned int RenderScriptRuntime::AllocationDetails::RSTypeToFormat[][3] =
-{
-    {eFormatHex, eFormatHex, 1}, // RS_TYPE_NONE
-    {eFormatFloat, eFormatVectorOfFloat16, 2}, // RS_TYPE_FLOAT_16
-    {eFormatFloat, eFormatVectorOfFloat32, sizeof(float)}, // RS_TYPE_FLOAT_32
-    {eFormatFloat, eFormatVectorOfFloat64, sizeof(double)}, // RS_TYPE_FLOAT_64
-    {eFormatDecimal, eFormatVectorOfSInt8, sizeof(int8_t)}, // RS_TYPE_SIGNED_8
-    {eFormatDecimal, eFormatVectorOfSInt16, sizeof(int16_t)}, // RS_TYPE_SIGNED_16
-    {eFormatDecimal, eFormatVectorOfSInt32, sizeof(int32_t)}, // RS_TYPE_SIGNED_32
-    {eFormatDecimal, eFormatVectorOfSInt64, sizeof(int64_t)}, // RS_TYPE_SIGNED_64
-    {eFormatDecimal, eFormatVectorOfUInt8, sizeof(uint8_t)}, // RS_TYPE_UNSIGNED_8
-    {eFormatDecimal, eFormatVectorOfUInt16, sizeof(uint16_t)}, // RS_TYPE_UNSIGNED_16
-    {eFormatDecimal, eFormatVectorOfUInt32, sizeof(uint32_t)}, // RS_TYPE_UNSIGNED_32
-    {eFormatDecimal, eFormatVectorOfUInt64, sizeof(uint64_t)}, // RS_TYPE_UNSIGNED_64
-    {eFormatBoolean, eFormatBoolean, 1}, // RS_TYPE_BOOL
-    {eFormatHex, eFormatHex, sizeof(uint16_t)}, // RS_TYPE_UNSIGNED_5_6_5
-    {eFormatHex, eFormatHex, sizeof(uint16_t)}, // RS_TYPE_UNSIGNED_5_5_5_1
-    {eFormatHex, eFormatHex, sizeof(uint16_t)}, // RS_TYPE_UNSIGNED_4_4_4_4
+const uint32_t RenderScriptRuntime::AllocationDetails::RSTypeToFormat[][3] = {
+    {eFormatHex, eFormatHex, 1},                                          // RS_TYPE_NONE
+    {eFormatFloat, eFormatVectorOfFloat16, 2},                            // RS_TYPE_FLOAT_16
+    {eFormatFloat, eFormatVectorOfFloat32, sizeof(float)},                // RS_TYPE_FLOAT_32
+    {eFormatFloat, eFormatVectorOfFloat64, sizeof(double)},               // RS_TYPE_FLOAT_64
+    {eFormatDecimal, eFormatVectorOfSInt8, sizeof(int8_t)},               // RS_TYPE_SIGNED_8
+    {eFormatDecimal, eFormatVectorOfSInt16, sizeof(int16_t)},             // RS_TYPE_SIGNED_16
+    {eFormatDecimal, eFormatVectorOfSInt32, sizeof(int32_t)},             // RS_TYPE_SIGNED_32
+    {eFormatDecimal, eFormatVectorOfSInt64, sizeof(int64_t)},             // RS_TYPE_SIGNED_64
+    {eFormatDecimal, eFormatVectorOfUInt8, sizeof(uint8_t)},              // RS_TYPE_UNSIGNED_8
+    {eFormatDecimal, eFormatVectorOfUInt16, sizeof(uint16_t)},            // RS_TYPE_UNSIGNED_16
+    {eFormatDecimal, eFormatVectorOfUInt32, sizeof(uint32_t)},            // RS_TYPE_UNSIGNED_32
+    {eFormatDecimal, eFormatVectorOfUInt64, sizeof(uint64_t)},            // RS_TYPE_UNSIGNED_64
+    {eFormatBoolean, eFormatBoolean, 1},                                  // RS_TYPE_BOOL
+    {eFormatHex, eFormatHex, sizeof(uint16_t)},                           // RS_TYPE_UNSIGNED_5_6_5
+    {eFormatHex, eFormatHex, sizeof(uint16_t)},                           // RS_TYPE_UNSIGNED_5_5_5_1
+    {eFormatHex, eFormatHex, sizeof(uint16_t)},                           // RS_TYPE_UNSIGNED_4_4_4_4
     {eFormatVectorOfFloat32, eFormatVectorOfFloat32, sizeof(float) * 16}, // RS_TYPE_MATRIX_4X4
-    {eFormatVectorOfFloat32, eFormatVectorOfFloat32, sizeof(float) * 9}, // RS_TYPE_MATRIX_3X3
-    {eFormatVectorOfFloat32, eFormatVectorOfFloat32, sizeof(float) * 4} // RS_TYPE_MATRIX_2X2
+    {eFormatVectorOfFloat32, eFormatVectorOfFloat32, sizeof(float) * 9},  // RS_TYPE_MATRIX_3X3
+    {eFormatVectorOfFloat32, eFormatVectorOfFloat32, sizeof(float) * 4}   // RS_TYPE_MATRIX_2X2
 };
 
 const std::string RenderScriptRuntime::s_runtimeExpandSuffix(".expand");
@@ -402,7 +397,7 @@ RenderScriptRuntime::CreateInstance(Process *process, lldb::LanguageType languag
     if (language == eLanguageTypeExtRenderScript)
         return new RenderScriptRuntime(process);
     else
-        return NULL;
+        return nullptr;
 }
 
 // Callback with a module to search for matching symbols.
@@ -410,10 +405,7 @@ RenderScriptRuntime::CreateInstance(Process *process, lldb::LanguageType languag
 // Then look for a symbol which matches our kernel name.
 // The breakpoint address is finally set using the address of this symbol.
 Searcher::CallbackReturn
-RSBreakpointResolver::SearchCallback(SearchFilter &filter,
-                                     SymbolContext &context,
-                                     Address*,
-                                     bool)
+RSBreakpointResolver::SearchCallback(SearchFilter &filter, SymbolContext &context, Address *, bool)
 {
     ModuleSP module = context.module_sp;
 
@@ -428,7 +420,7 @@ RSBreakpointResolver::SearchCallback(SearchFilter &filter,
     // If it's not found, it's likely debug info is unavailable - try to set a
     // breakpoint on <name>.expand.
 
-    const Symbol* kernel_sym = module->FindFirstSymbolWithNameAndType(m_kernel_name, eSymbolTypeCode);
+    const Symbol *kernel_sym = module->FindFirstSymbolWithNameAndType(m_kernel_name, eSymbolTypeCode);
     if (!kernel_sym)
     {
         std::string kernel_name_expanded(m_kernel_name.AsCString());
@@ -449,7 +441,8 @@ RSBreakpointResolver::SearchCallback(SearchFilter &filter,
 void
 RenderScriptRuntime::Initialize()
 {
-    PluginManager::RegisterPlugin(GetPluginNameStatic(), "RenderScript language support", CreateInstance, GetCommandObject);
+    PluginManager::RegisterPlugin(GetPluginNameStatic(), "RenderScript language support", CreateInstance,
+                                  GetCommandObject);
 }
 
 void
@@ -495,7 +488,6 @@ RenderScriptRuntime::GetModuleKind(const lldb::ModuleSP &module_sp)
         {
             return eModuleKindImpl;
         }
-
     }
     return eModuleKindIgnored;
 }
@@ -507,15 +499,15 @@ RenderScriptRuntime::IsRenderScriptModule(const lldb::ModuleSP &module_sp)
 }
 
 void
-RenderScriptRuntime::ModulesDidLoad(const ModuleList &module_list )
+RenderScriptRuntime::ModulesDidLoad(const ModuleList &module_list)
 {
-    Mutex::Locker locker (module_list.GetMutex ());
+    Mutex::Locker locker(module_list.GetMutex());
 
     size_t num_modules = module_list.GetSize();
     for (size_t i = 0; i < num_modules; i++)
     {
-        auto mod = module_list.GetModuleAtIndex (i);
-        if (IsRenderScriptModule (mod))
+        auto mod = module_list.GetModuleAtIndex(i);
+        if (IsRenderScriptModule(mod))
         {
             LoadModule(mod);
         }
@@ -552,8 +544,7 @@ RenderScriptRuntime::GetDynamicTypeAndAddress(ValueObject &in_value, lldb::Dynam
 }
 
 TypeAndOrName
-RenderScriptRuntime::FixUpDynamicType (const TypeAndOrName& type_and_or_name,
-                                       ValueObject& static_value)
+RenderScriptRuntime::FixUpDynamicType(const TypeAndOrName &type_and_or_name, ValueObject &static_value)
 {
     return type_and_or_name;
 }
@@ -571,70 +562,71 @@ RenderScriptRuntime::CreateExceptionResolver(Breakpoint *bkpt, bool catch_bp, bo
     return resolver_sp;
 }
 
-const RenderScriptRuntime::HookDefn RenderScriptRuntime::s_runtimeHookDefns[] =
-{
-    //rsdScript
-    {
-        "rsdScriptInit", //name
-        "_Z13rsdScriptInitPKN7android12renderscript7ContextEPNS0_7ScriptCEPKcS7_PKhjj", // symbol name 32 bit
-        "_Z13rsdScriptInitPKN7android12renderscript7ContextEPNS0_7ScriptCEPKcS7_PKhmj", // symbol name 64 bit
-        0, // version
-        RenderScriptRuntime::eModuleKindDriver, // type
-        &lldb_private::RenderScriptRuntime::CaptureScriptInit1 // handler
+const RenderScriptRuntime::HookDefn RenderScriptRuntime::s_runtimeHookDefns[] = {
+    // rsdScript
+    {
+        "rsdScriptInit",
+        "_Z13rsdScriptInitPKN7android12renderscript7ContextEPNS0_7ScriptCEPKcS7_PKhjj",
+        "_Z13rsdScriptInitPKN7android12renderscript7ContextEPNS0_7ScriptCEPKcS7_PKhmj",
+        0,
+        RenderScriptRuntime::eModuleKindDriver,
+        &lldb_private::RenderScriptRuntime::CaptureScriptInit
     },
     {
-        "rsdScriptInvokeForEachMulti", // name
-        "_Z27rsdScriptInvokeForEachMultiPKN7android12renderscript7ContextEPNS0_6ScriptEjPPKNS0_10AllocationEjPS6_PKvjPK12RsScriptCall", // symbol name 32bit
-        "_Z27rsdScriptInvokeForEachMultiPKN7android12renderscript7ContextEPNS0_6ScriptEjPPKNS0_10AllocationEmPS6_PKvmPK12RsScriptCall", // symbol name 64bit
-        0, // version
-        RenderScriptRuntime::eModuleKindDriver, // type
-        &lldb_private::RenderScriptRuntime::CaptureScriptInvokeForEachMulti // handler
+        "rsdScriptInvokeForEachMulti",
+        "_Z27rsdScriptInvokeForEachMultiPKN7android12renderscript7ContextEPNS0_6ScriptEjPPKNS0_10AllocationEjPS6_PKvjPK12RsScriptCall",
+        "_Z27rsdScriptInvokeForEachMultiPKN7android12renderscript7ContextEPNS0_6ScriptEjPPKNS0_10AllocationEmPS6_PKvmPK12RsScriptCall",
+        0,
+        RenderScriptRuntime::eModuleKindDriver,
+        &lldb_private::RenderScriptRuntime::CaptureScriptInvokeForEachMulti
     },
     {
-        "rsdScriptSetGlobalVar", // name
-        "_Z21rsdScriptSetGlobalVarPKN7android12renderscript7ContextEPKNS0_6ScriptEjPvj", // symbol name 32bit
-        "_Z21rsdScriptSetGlobalVarPKN7android12renderscript7ContextEPKNS0_6ScriptEjPvm", // symbol name 64bit
-        0, // version
-        RenderScriptRuntime::eModuleKindDriver, // type
-        &lldb_private::RenderScriptRuntime::CaptureSetGlobalVar1 // handler
+        "rsdScriptSetGlobalVar",
+        "_Z21rsdScriptSetGlobalVarPKN7android12renderscript7ContextEPKNS0_6ScriptEjPvj",
+        "_Z21rsdScriptSetGlobalVarPKN7android12renderscript7ContextEPKNS0_6ScriptEjPvm",
+        0,
+        RenderScriptRuntime::eModuleKindDriver,
+        &lldb_private::RenderScriptRuntime::CaptureSetGlobalVar
     },
 
-    //rsdAllocation
+    // rsdAllocation
     {
-        "rsdAllocationInit", // name
-        "_Z17rsdAllocationInitPKN7android12renderscript7ContextEPNS0_10AllocationEb", // symbol name 32bit
-        "_Z17rsdAllocationInitPKN7android12renderscript7ContextEPNS0_10AllocationEb", // symbol name 64bit
-        0, // version
-        RenderScriptRuntime::eModuleKindDriver, // type
-        &lldb_private::RenderScriptRuntime::CaptureAllocationInit1 // handler
+        "rsdAllocationInit",
+        "_Z17rsdAllocationInitPKN7android12renderscript7ContextEPNS0_10AllocationEb",
+        "_Z17rsdAllocationInitPKN7android12renderscript7ContextEPNS0_10AllocationEb",
+        0,
+        RenderScriptRuntime::eModuleKindDriver,
+        &lldb_private::RenderScriptRuntime::CaptureAllocationInit
     },
     {
-        "rsdAllocationRead2D", //name
-        "_Z19rsdAllocationRead2DPKN7android12renderscript7ContextEPKNS0_10AllocationEjjj23RsAllocationCubemapFacejjPvjj", // symbol name 32bit
-        "_Z19rsdAllocationRead2DPKN7android12renderscript7ContextEPKNS0_10AllocationEjjj23RsAllocationCubemapFacejjPvmm", // symbol name 64bit
-        0, // version
-        RenderScriptRuntime::eModuleKindDriver, // type
-        nullptr // handler
+        "rsdAllocationRead2D",
+        "_Z19rsdAllocationRead2DPKN7android12renderscript7ContextEPKNS0_10AllocationEjjj23RsAllocationCubemapFacejjPvjj",
+        "_Z19rsdAllocationRead2DPKN7android12renderscript7ContextEPKNS0_10AllocationEjjj23RsAllocationCubemapFacejjPvmm",
+        0,
+        RenderScriptRuntime::eModuleKindDriver,
+        nullptr
     },
     {
-        "rsdAllocationDestroy", // name
-        "_Z20rsdAllocationDestroyPKN7android12renderscript7ContextEPNS0_10AllocationE", // symbol name 32bit
-        "_Z20rsdAllocationDestroyPKN7android12renderscript7ContextEPNS0_10AllocationE", // symbol name 64bit
-        0, // version
-        RenderScriptRuntime::eModuleKindDriver, // type
-        &lldb_private::RenderScriptRuntime::CaptureAllocationDestroy // handler
+        "rsdAllocationDestroy",
+        "_Z20rsdAllocationDestroyPKN7android12renderscript7ContextEPNS0_10AllocationE",
+        "_Z20rsdAllocationDestroyPKN7android12renderscript7ContextEPNS0_10AllocationE",
+        0,
+        RenderScriptRuntime::eModuleKindDriver,
+        &lldb_private::RenderScriptRuntime::CaptureAllocationDestroy
     },
 };
 
-const size_t RenderScriptRuntime::s_runtimeHookCount = sizeof(s_runtimeHookDefns)/sizeof(s_runtimeHookDefns[0]);
+const size_t RenderScriptRuntime::s_runtimeHookCount = sizeof(s_runtimeHookDefns) / sizeof(s_runtimeHookDefns[0]);
 
 bool
-RenderScriptRuntime::HookCallback(void *baton, StoppointCallbackContext *ctx, lldb::user_id_t break_id, lldb::user_id_t break_loc_id)
+RenderScriptRuntime::HookCallback(void *baton, StoppointCallbackContext *ctx, lldb::user_id_t break_id,
+                                  lldb::user_id_t break_loc_id)
 {
-    RuntimeHook* hook_info = (RuntimeHook*)baton;
+    RuntimeHook *hook_info = (RuntimeHook *)baton;
     ExecutionContext context(ctx->exe_ctx_ref);
 
-    RenderScriptRuntime *lang_rt = (RenderScriptRuntime *)context.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript);
+    RenderScriptRuntime *lang_rt =
+        (RenderScriptRuntime *)context.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript);
 
     lang_rt->HookCallback(hook_info, context);
 
@@ -642,12 +634,12 @@ RenderScriptRuntime::HookCallback(void *baton, StoppointCallbackContext *ctx, ll
 }
 
 void
-RenderScriptRuntime::HookCallback(RuntimeHook* hook_info, ExecutionContext& context)
+RenderScriptRuntime::HookCallback(RuntimeHook *hook_info, ExecutionContext &context)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (log)
-        log->Printf ("RenderScriptRuntime::HookCallback - '%s' .", hook_info->defn->name);
+        log->Printf("%s - '%s'", __FUNCTION__, hook_info->defn->name);
 
     if (hook_info->defn->grabber)
     {
@@ -671,16 +663,16 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
     if (!data)
         return false;
 
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
     Error error;
-    RegisterContext* reg_ctx = context.GetRegisterContext();
-    Process* process = context.GetProcessPtr();
+    RegisterContext *reg_ctx = context.GetRegisterContext();
+    Process *process = context.GetProcessPtr();
     bool success = false; // return value
 
     if (!context.GetTargetPtr())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetArgSimple - Invalid target");
+            log->Printf("%s - invalid target", __FUNCTION__);
 
         return false;
     }
@@ -696,7 +688,7 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
             if (error.Fail())
             {
                 if (log)
-                    log->Printf("RenderScriptRuntime::GetArgSimple - error reading X86 stack: %s.", error.AsCString());
+                    log->Printf("%s - error reading X86 stack: '%s'.", __FUNCTION__, error.AsCString());
             }
             else
             {
@@ -715,10 +707,11 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
             if (arg > 5)
             {
                 if (log)
-                    log->Warning("X86_64 register spill is not supported.");
+                    log->Warning("%s - X86_64 - reading arguments passed on stack not supported yet.",
+                                 __FUNCTION__);
                 break;
             }
-            const char * regnames[] = {"rdi", "rsi", "rdx", "rcx", "r8", "r9"};
+            const char *regnames[] = {"rdi", "rsi", "rdx", "rcx", "r8", "r9"};
             assert((sizeof(regnames) / sizeof(const char *)) > arg);
             const RegisterInfo *rArg = reg_ctx->GetRegisterInfoByName(regnames[arg]);
             RegisterValue rVal;
@@ -730,7 +723,7 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
             else
             {
                 if (log)
-                    log->Printf("RenderScriptRuntime::GetArgSimple - error reading x86_64 register: %d.", arg);
+                    log->Printf("%s - error reading x86_64 register: %" PRId32 ".", __FUNCTION__, arg);
             }
             break;
         }
@@ -740,7 +733,7 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
             // first 4 arguments are passed via registers
             if (arg < 4)
             {
-                const RegisterInfo* rArg = reg_ctx->GetRegisterInfoAtIndex(arg);
+                const RegisterInfo *rArg = reg_ctx->GetRegisterInfoAtIndex(arg);
                 RegisterValue rVal;
                 success = reg_ctx->ReadRegister(rArg, rVal);
                 if (success)
@@ -750,19 +743,19 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
                 else
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple - error reading ARM register: %d.", arg);
+                        log->Printf("%s - error reading ARM register: %" PRId32 ".", __FUNCTION__, arg);
                 }
             }
             else
             {
                 uint64_t sp = reg_ctx->GetSP();
-                uint32_t offset = (arg-4) * sizeof(uint32_t);
+                uint32_t offset = (arg - 4) * sizeof(uint32_t);
                 uint32_t value = 0;
                 size_t bytes_read = process->ReadMemory(sp + offset, &value, sizeof(value), error);
                 if (error.Fail() || bytes_read != sizeof(value))
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple - error reading ARM stack: %s.", error.AsCString());
+                        log->Printf("%s - error reading ARM stack: %s.", __FUNCTION__, error.AsCString());
                 }
                 else
                 {
@@ -778,7 +771,7 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
             // first 8 arguments are in the registers
             if (arg < 8)
             {
-                const RegisterInfo* rArg = reg_ctx->GetRegisterInfoAtIndex(arg);
+                const RegisterInfo *rArg = reg_ctx->GetRegisterInfoAtIndex(arg);
                 RegisterValue rVal;
                 success = reg_ctx->ReadRegister(rArg, rVal);
                 if (success)
@@ -788,14 +781,16 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
                 else
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple() - AARCH64 - Error while reading the argument #%d", arg);
+                        log->Printf("%s - AARCH64 - error while reading the argument #%" PRId32 ".",
+                                    __FUNCTION__, arg);
                 }
             }
             else
             {
                 // @TODO: need to find the argument in the stack
                 if (log)
-                    log->Printf("RenderScriptRuntime::GetArgSimple - AARCH64 - FOR #ARG >= 8 NOT IMPLEMENTED YET. Argument number: %d", arg);
+                    log->Printf("%s - AARCH64 - reading arguments passed on stack not supported yet.",
+                                __FUNCTION__);
             }
             break;
         }
@@ -803,8 +798,9 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
         {
             // read from the registers
             // first 4 arguments are passed in registers
-            if (arg < 4){
-                const RegisterInfo* rArg = reg_ctx->GetRegisterInfoAtIndex(arg + 4);
+            if (arg < 4)
+            {
+                const RegisterInfo *rArg = reg_ctx->GetRegisterInfoAtIndex(arg + 4);
                 RegisterValue rVal;
                 success = reg_ctx->ReadRegister(rArg, rVal);
                 if (success)
@@ -814,7 +810,8 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
                 else
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple() - Mips - Error while reading the argument #%d", arg);
+                        log->Printf("%s - Mips - error while reading the argument #%" PRId32 "",
+                                    __FUNCTION__, arg);
                 }
             }
             // arguments > 4 are read from the stack
@@ -827,7 +824,8 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
                 if (error.Fail() || bytes_read != sizeof(value))
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple - error reading Mips stack: %s.", error.AsCString());
+                        log->Printf("%s - error reading Mips stack: %s.",
+                                    __FUNCTION__, error.AsCString());
                 }
                 else
                 {
@@ -842,7 +840,7 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
             // read from the registers
             if (arg < 8)
             {
-                const RegisterInfo* rArg = reg_ctx->GetRegisterInfoAtIndex(arg + 4);
+                const RegisterInfo *rArg = reg_ctx->GetRegisterInfoAtIndex(arg + 4);
                 RegisterValue rVal;
                 success = reg_ctx->ReadRegister(rArg, rVal);
                 if (success)
@@ -852,7 +850,8 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
                 else
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple - Mips64 - Error reading the argument #%d", arg);
+                        log->Printf("%s - Mips64 - error reading the argument #%" PRId32 "",
+                                    __FUNCTION__, arg);
                 }
             }
             // arguments > 8 are read from the stack
@@ -865,7 +864,8 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
                 if (error.Fail() || bytes_read != sizeof(value))
                 {
                     if (log)
-                        log->Printf("RenderScriptRuntime::GetArgSimple - Mips64 - Error reading Mips64 stack: %s.", error.AsCString());
+                        log->Printf("%s - Mips64 - error reading Mips64 stack: %s.",
+                                    __FUNCTION__, error.AsCString());
                 }
                 else
                 {
@@ -879,14 +879,14 @@ RenderScriptRuntime::GetArgSimple(ExecutionContext &context, uint32_t arg, uint6
         {
             // invalid architecture
             if (log)
-                log->Printf("RenderScriptRuntime::GetArgSimple - Architecture not supported");
+                log->Printf("%s - architecture not supported.", __FUNCTION__);
         }
     }
 
     if (!success)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetArgSimple - failed to get argument at index %" PRIu32, arg);
+            log->Printf("%s - failed to get argument at index %" PRIu32 ".", __FUNCTION__, arg);
     }
     return success;
 }
@@ -925,8 +925,7 @@ RenderScriptRuntime::CaptureScriptInvokeForEachMulti(RuntimeHook* hook_info,
     if (!success)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::CaptureScriptInvokeForEachMulti()"
-                        " - Error while reading the function parameters");
+            log->Printf("%s - Error while reading the function parameters", __FUNCTION__);
         return;
     }
 
@@ -948,8 +947,7 @@ RenderScriptRuntime::CaptureScriptInvokeForEachMulti(RuntimeHook* hook_info,
         if (read != target_ptr_size || !error.Success())
         {
             if (log)
-                log->Printf("RenderScriptRuntime::CaptureScriptInvokeForEachMulti()"
-                            " - Error while reading allocation list argument %" PRId64, i);
+                log->Printf("%s - Error while reading allocation list argument %" PRId64, __FUNCTION__, i);
         }
         else
         {
@@ -984,8 +982,7 @@ RenderScriptRuntime::CaptureScriptInvokeForEachMulti(RuntimeHook* hook_info,
             if (log)
             {
                 if (alloc->context.isValid() && *alloc->context.get() != args.context)
-                    log->Printf("RenderScriptRuntime::CaptureScriptInvokeForEachMulti"
-                                " - Allocation used by multiple contexts");
+                    log->Printf("%s - Allocation used by multiple contexts", __FUNCTION__);
             }
             alloc->context = args.context;
         }
@@ -997,19 +994,18 @@ RenderScriptRuntime::CaptureScriptInvokeForEachMulti(RuntimeHook* hook_info,
         if (log)
         {
             if (script->context.isValid() && *script->context.get() != args.context)
-                log->Printf("RenderScriptRuntime::CaptureScriptInvokeForEachMulti"
-                            " - Script used by multiple contexts");
+                log->Printf("%s - Script used by multiple contexts", __FUNCTION__);
         }
         script->context = args.context;
     }
 }
 
 void
-RenderScriptRuntime::CaptureSetGlobalVar1(RuntimeHook* hook_info, ExecutionContext& context)
+RenderScriptRuntime::CaptureSetGlobalVar(RuntimeHook *hook_info, ExecutionContext &context)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
-    //Context, Script, int, data, length
+    // Context, Script, int, data, length
 
     uint64_t rs_context_u64 = 0U;
     uint64_t rs_script_u64 = 0U;
@@ -1017,115 +1013,113 @@ RenderScriptRuntime::CaptureSetGlobalVar1(RuntimeHook* hook_info, ExecutionConte
     uint64_t rs_data_u64 = 0U;
     uint64_t rs_length_u64 = 0U;
 
-    bool success =
-        GetArgSimple(context, 0, &rs_context_u64) &&
-        GetArgSimple(context, 1, &rs_script_u64) &&
-        GetArgSimple(context, 2, &rs_id_u64) &&
-        GetArgSimple(context, 3, &rs_data_u64) &&
-        GetArgSimple(context, 4, &rs_length_u64);
+    bool success = GetArgSimple(context, 0, &rs_context_u64) &&
+                   GetArgSimple(context, 1, &rs_script_u64) &&
+                   GetArgSimple(context, 2, &rs_id_u64) &&
+                   GetArgSimple(context, 3, &rs_data_u64) &&
+                   GetArgSimple(context, 4, &rs_length_u64);
 
     if (!success)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::CaptureSetGlobalVar1 - Error while reading the function parameters");
+            log->Printf("%s - error reading the function parameters.", __FUNCTION__);
         return;
     }
 
     if (log)
     {
-        log->Printf ("RenderScriptRuntime::CaptureSetGlobalVar1 - 0x%" PRIx64 ",0x%" PRIx64 " slot %" PRIu64 " = 0x%" PRIx64 ":%" PRIu64 "bytes.",
-                        rs_context_u64, rs_script_u64, rs_id_u64, rs_data_u64, rs_length_u64);
+        log->Printf("%s - 0x%" PRIx64 ",0x%" PRIx64 " slot %" PRIu64 " = 0x%" PRIx64 ":%" PRIu64 "bytes.",
+                    __FUNCTION__, rs_context_u64, rs_script_u64, rs_id_u64, rs_data_u64, rs_length_u64);
 
-        addr_t script_addr =  (addr_t)rs_script_u64;
-        if (m_scriptMappings.find( script_addr ) != m_scriptMappings.end())
+        addr_t script_addr = (addr_t)rs_script_u64;
+        if (m_scriptMappings.find(script_addr) != m_scriptMappings.end())
         {
             auto rsm = m_scriptMappings[script_addr];
             if (rs_id_u64 < rsm->m_globals.size())
             {
                 auto rsg = rsm->m_globals[rs_id_u64];
-                log->Printf ("RenderScriptRuntime::CaptureSetGlobalVar1 - Setting of '%s' within '%s' inferred", rsg.m_name.AsCString(),
-                                rsm->m_module->GetFileSpec().GetFilename().AsCString());
+                log->Printf("%s - setting of '%s' within '%s' inferred.", __FUNCTION__,
+                            rsg.m_name.AsCString(), rsm->m_module->GetFileSpec().GetFilename().AsCString());
             }
         }
     }
 }
 
 void
-RenderScriptRuntime::CaptureAllocationInit1(RuntimeHook* hook_info, ExecutionContext& context)
+RenderScriptRuntime::CaptureAllocationInit(RuntimeHook *hook_info, ExecutionContext &context)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
-    //Context, Alloc, bool
+    // Context, Alloc, bool
 
     uint64_t rs_context_u64 = 0U;
     uint64_t rs_alloc_u64 = 0U;
     uint64_t rs_forceZero_u64 = 0U;
 
-    bool success =
-        GetArgSimple(context, 0, &rs_context_u64) &&
-        GetArgSimple(context, 1, &rs_alloc_u64) &&
-        GetArgSimple(context, 2, &rs_forceZero_u64);
+    bool success = GetArgSimple(context, 0, &rs_context_u64) &&
+                   GetArgSimple(context, 1, &rs_alloc_u64) &&
+                   GetArgSimple(context, 2, &rs_forceZero_u64);
     if (!success) // error case
     {
         if (log)
-            log->Printf("RenderScriptRuntime::CaptureAllocationInit1 - Error while reading the function parameters");
+            log->Printf("%s - error while reading the function parameters", __FUNCTION__);
         return; // abort
     }
 
     if (log)
-        log->Printf ("RenderScriptRuntime::CaptureAllocationInit1 - 0x%" PRIx64 ",0x%" PRIx64 ",0x%" PRIx64 " .",
-                        rs_context_u64, rs_alloc_u64, rs_forceZero_u64);
+        log->Printf("%s - 0x%" PRIx64 ",0x%" PRIx64 ",0x%" PRIx64 " .", __FUNCTION__,
+                    rs_context_u64, rs_alloc_u64, rs_forceZero_u64);
 
-    AllocationDetails* alloc = LookUpAllocation(rs_alloc_u64, true);
+    AllocationDetails *alloc = LookUpAllocation(rs_alloc_u64, true);
     if (alloc)
         alloc->context = rs_context_u64;
 }
 
 void
-RenderScriptRuntime::CaptureAllocationDestroy(RuntimeHook* hook_info, ExecutionContext& context)
+RenderScriptRuntime::CaptureAllocationDestroy(RuntimeHook *hook_info, ExecutionContext &context)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     // Context, Alloc
     uint64_t rs_context_u64 = 0U;
     uint64_t rs_alloc_u64 = 0U;
 
-    bool success = GetArgSimple(context, 0, &rs_context_u64) && GetArgSimple(context, 1, &rs_alloc_u64);
-    if (!success) // error case
+    bool success = GetArgSimple(context, 0, &rs_context_u64) &&
+                   GetArgSimple(context, 1, &rs_alloc_u64);
+    if (!success)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::CaptureAllocationDestroy - Error while reading the function parameters");
-        return; // abort
+            log->Printf("%s - error while reading the function parameters.", __FUNCTION__);
+        return;
     }
 
     if (log)
-        log->Printf("RenderScriptRuntime::CaptureAllocationDestroy - 0x%" PRIx64 ", 0x%" PRIx64 ".",
-                    rs_context_u64, rs_alloc_u64);
+        log->Printf("%s - 0x%" PRIx64 ", 0x%" PRIx64 ".", __FUNCTION__, rs_context_u64, rs_alloc_u64);
 
     for (auto iter = m_allocations.begin(); iter != m_allocations.end(); ++iter)
     {
-        auto& allocation_ap = *iter; // get the unique pointer
+        auto &allocation_ap = *iter; // get the unique pointer
         if (allocation_ap->address.isValid() && *allocation_ap->address.get() == rs_alloc_u64)
         {
             m_allocations.erase(iter);
             if (log)
-                log->Printf("RenderScriptRuntime::CaptureAllocationDestroy - Deleted allocation entry");
+                log->Printf("%s - deleted allocation entry.", __FUNCTION__);
             return;
         }
     }
 
     if (log)
-        log->Printf("RenderScriptRuntime::CaptureAllocationDestroy - Couldn't find destroyed allocation");
+        log->Printf("%s - couldn't find destroyed allocation.", __FUNCTION__);
 }
 
 void
-RenderScriptRuntime::CaptureScriptInit1(RuntimeHook* hook_info, ExecutionContext& context)
+RenderScriptRuntime::CaptureScriptInit(RuntimeHook *hook_info, ExecutionContext &context)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
-    //Context, Script, resname Str, cachedir Str
+    // Context, Script, resname Str, cachedir Str
     Error error;
-    Process* process = context.GetProcessPtr();
+    Process *process = context.GetProcessPtr();
 
     uint64_t rs_context_u64 = 0U;
     uint64_t rs_script_u64 = 0U;
@@ -1136,16 +1130,15 @@ RenderScriptRuntime::CaptureScriptInit1(RuntimeHook* hook_info, ExecutionContext
     std::string cachedir;
 
     // read the function parameters
-    bool success =
-        GetArgSimple(context, 0, &rs_context_u64) &&
-        GetArgSimple(context, 1, &rs_script_u64) &&
-        GetArgSimple(context, 2, &rs_resnameptr_u64) &&
-        GetArgSimple(context, 3, &rs_cachedirptr_u64);
+    bool success = GetArgSimple(context, 0, &rs_context_u64) &&
+                   GetArgSimple(context, 1, &rs_script_u64) &&
+                   GetArgSimple(context, 2, &rs_resnameptr_u64) &&
+                   GetArgSimple(context, 3, &rs_cachedirptr_u64);
 
     if (!success)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::CaptureScriptInit1 - Error while reading the function parameters");
+            log->Printf("%s - error while reading the function parameters.", __FUNCTION__);
         return;
     }
 
@@ -1153,27 +1146,26 @@ RenderScriptRuntime::CaptureScriptInit1(RuntimeHook* hook_info, ExecutionContext
     if (error.Fail())
     {
         if (log)
-            log->Printf ("RenderScriptRuntime::CaptureScriptInit1 - error reading resname: %s.", error.AsCString());
-
+            log->Printf("%s - error reading resname: %s.", __FUNCTION__, error.AsCString());
     }
 
     process->ReadCStringFromMemory((lldb::addr_t)rs_cachedirptr_u64, cachedir, error);
     if (error.Fail())
     {
         if (log)
-            log->Printf ("RenderScriptRuntime::CaptureScriptInit1 - error reading cachedir: %s.", error.AsCString());
+            log->Printf("%s - error reading cachedir: %s.", __FUNCTION__, error.AsCString());
     }
 
     if (log)
-        log->Printf ("RenderScriptRuntime::CaptureScriptInit1 - 0x%" PRIx64 ",0x%" PRIx64 " => '%s' at '%s' .",
-                     rs_context_u64, rs_script_u64, resname.c_str(), cachedir.c_str());
+        log->Printf("%s - 0x%" PRIx64 ",0x%" PRIx64 " => '%s' at '%s' .", __FUNCTION__,
+                    rs_context_u64, rs_script_u64, resname.c_str(), cachedir.c_str());
 
     if (resname.size() > 0)
     {
         StreamString strm;
         strm.Printf("librs.%s.so", resname.c_str());
 
-        ScriptDetails* script = LookUpScript(rs_script_u64, true);
+        ScriptDetails *script = LookUpScript(rs_script_u64, true);
         if (script)
         {
             script->type = ScriptDetails::eScriptC;
@@ -1184,19 +1176,19 @@ RenderScriptRuntime::CaptureScriptInit1(RuntimeHook* hook_info, ExecutionContext
         }
 
         if (log)
-            log->Printf ("RenderScriptRuntime::CaptureScriptInit1 - '%s' tagged with context 0x%" PRIx64 " and script 0x%" PRIx64 ".",
-                         strm.GetData(), rs_context_u64, rs_script_u64);
+            log->Printf("%s - '%s' tagged with context 0x%" PRIx64 " and script 0x%" PRIx64 ".",
+                        __FUNCTION__, strm.GetData(), rs_context_u64, rs_script_u64);
     }
     else if (log)
     {
-        log->Printf ("RenderScriptRuntime::CaptureScriptInit1 - resource name invalid, Script not tagged");
+        log->Printf("%s - resource name invalid, Script not tagged.", __FUNCTION__);
     }
 }
 
 void
 RenderScriptRuntime::LoadRuntimeHooks(lldb::ModuleSP module, ModuleKind kind)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!module)
     {
@@ -1206,17 +1198,15 @@ RenderScriptRuntime::LoadRuntimeHooks(lldb::ModuleSP module, ModuleKind kind)
     Target &target = GetProcess()->GetTarget();
     llvm::Triple::ArchType targetArchType = target.GetArchitecture().GetMachine();
 
-    if (targetArchType != llvm::Triple::ArchType::x86
-        && targetArchType != llvm::Triple::ArchType::arm
-        && targetArchType != llvm::Triple::ArchType::aarch64
-        && targetArchType != llvm::Triple::ArchType::mipsel
-        && targetArchType != llvm::Triple::ArchType::mips64el
-        && targetArchType != llvm::Triple::ArchType::x86_64
-    )
+    if (targetArchType != llvm::Triple::ArchType::x86 &&
+        targetArchType != llvm::Triple::ArchType::arm &&
+        targetArchType != llvm::Triple::ArchType::aarch64 &&
+        targetArchType != llvm::Triple::ArchType::mipsel &&
+        targetArchType != llvm::Triple::ArchType::mips64el &&
+        targetArchType != llvm::Triple::ArchType::x86_64)
     {
         if (log)
-            log->Printf ("RenderScriptRuntime::LoadRuntimeHooks - Unable to hook runtime. Only X86, ARM, Mips supported currently.");
-
+            log->Printf("%s - unable to hook runtime functions.", __FUNCTION__);
         return;
     }
 
@@ -1224,17 +1214,21 @@ RenderScriptRuntime::LoadRuntimeHooks(lldb::ModuleSP module, ModuleKind kind)
 
     for (size_t idx = 0; idx < s_runtimeHookCount; idx++)
     {
-        const HookDefn* hook_defn = &s_runtimeHookDefns[idx];
-        if (hook_defn->kind != kind) {
+        const HookDefn *hook_defn = &s_runtimeHookDefns[idx];
+        if (hook_defn->kind != kind)
+        {
             continue;
         }
 
-        const char* symbol_name = (archByteSize == 4) ? hook_defn->symbol_name_m32 : hook_defn->symbol_name_m64;
+        const char *symbol_name = (archByteSize == 4) ? hook_defn->symbol_name_m32 : hook_defn->symbol_name_m64;
 
         const Symbol *sym = module->FindFirstSymbolWithNameAndType(ConstString(symbol_name), eSymbolTypeCode);
-        if (!sym){
-            if (log){
-                log->Printf("RenderScriptRuntime::LoadRuntimeHooks - ERROR: Symbol '%s' related to the function %s not found", symbol_name, hook_defn->name);
+        if (!sym)
+        {
+            if (log)
+            {
+                log->Printf("%s - symbol '%s' related to the function %s not found",
+                            __FUNCTION__, symbol_name, hook_defn->name);
             }
             continue;
         }
@@ -1243,14 +1237,15 @@ RenderScriptRuntime::LoadRuntimeHooks(lldb::ModuleSP module, ModuleKind kind)
         if (addr == LLDB_INVALID_ADDRESS)
         {
             if (log)
-                log->Printf ("RenderScriptRuntime::LoadRuntimeHooks - Unable to resolve the address of hook function '%s' with symbol '%s'.",
-                             hook_defn->name, symbol_name);
+                log->Printf("%s - unable to resolve the address of hook function '%s' with symbol '%s'.",
+                            __FUNCTION__, hook_defn->name, symbol_name);
             continue;
         }
         else
         {
             if (log)
-                log->Printf("RenderScriptRuntime::LoadRuntimeHooks - Function %s, address resolved at 0x%" PRIx64, hook_defn->name, addr);
+                log->Printf("%s - function %s, address resolved at 0x%" PRIx64,
+                            __FUNCTION__, hook_defn->name, addr);
         }
 
         RuntimeHookSP hook(new RuntimeHook());
@@ -1261,8 +1256,9 @@ RenderScriptRuntime::LoadRuntimeHooks(lldb::ModuleSP module, ModuleKind kind)
         m_runtimeHooks[addr] = hook;
         if (log)
         {
-            log->Printf ("RenderScriptRuntime::LoadRuntimeHooks - Successfully hooked '%s' in '%s' version %" PRIu64 " at 0x%" PRIx64 ".",
-                hook_defn->name, module->GetFileSpec().GetFilename().AsCString(), (uint64_t)hook_defn->version, (uint64_t)addr);
+            log->Printf("%s - successfully hooked '%s' in '%s' version %" PRIu64 " at 0x%" PRIx64 ".",
+                        __FUNCTION__, hook_defn->name, module->GetFileSpec().GetFilename().AsCString(),
+                        (uint64_t)hook_defn->version, (uint64_t)addr);
         }
     }
 }
@@ -1273,14 +1269,14 @@ RenderScriptRuntime::FixupScriptDetails(RSModuleDescriptorSP rsmodule_sp)
     if (!rsmodule_sp)
         return;
 
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     const ModuleSP module = rsmodule_sp->m_module;
-    const FileSpec& file = module->GetPlatformFileSpec();
+    const FileSpec &file = module->GetPlatformFileSpec();
 
     // Iterate over all of the scripts that we currently know of.
     // Note: We cant push or pop to m_scripts here or it may invalidate rs_script.
-    for (const auto & rs_script : m_scripts)
+    for (const auto &rs_script : m_scripts)
     {
         // Extract the expected .so file path for this script.
         std::string dylib;
@@ -1303,8 +1299,8 @@ RenderScriptRuntime::FixupScriptDetails(RSModuleDescriptorSP rsmodule_sp)
             if (m_scriptMappings[script] != rsmodule_sp)
             {
                 if (log)
-                    log->Printf ("RenderScriptRuntime::FixupScriptDetails - Error: script %" PRIx64 " wants reassigned to new rsmodule '%s'.",
-                                    (uint64_t)script, rsmodule_sp->m_module->GetFileSpec().GetFilename().AsCString());
+                    log->Printf("%s - script %" PRIx64 " wants reassigned to new rsmodule '%s'.", __FUNCTION__,
+                                (uint64_t)script, rsmodule_sp->m_module->GetFileSpec().GetFilename().AsCString());
             }
         }
         // We don't have a script mapping for the current script.
@@ -1318,8 +1314,8 @@ RenderScriptRuntime::FixupScriptDetails(RSModuleDescriptorSP rsmodule_sp)
             // Add Script/Module pair to map.
             m_scriptMappings[script] = rsmodule_sp;
             if (log)
-                log->Printf ("RenderScriptRuntime::FixupScriptDetails - script %" PRIx64 " associated with rsmodule '%s'.",
-                                (uint64_t)script, rsmodule_sp->m_module->GetFileSpec().GetFilename().AsCString());
+                log->Printf("%s - script %" PRIx64 " associated with rsmodule '%s'.", __FUNCTION__,
+                            (uint64_t)script, rsmodule_sp->m_module->GetFileSpec().GetFilename().AsCString());
         }
     }
 }
@@ -1328,11 +1324,11 @@ RenderScriptRuntime::FixupScriptDetails(RSModuleDescriptorSP rsmodule_sp)
 // The result of that expression is returned an unsigned 64 bit int, via the result* paramter.
 // Function returns true on success, and false on failure
 bool
-RenderScriptRuntime::EvalRSExpression(const char* expression, StackFrame* frame_ptr, uint64_t* result)
+RenderScriptRuntime::EvalRSExpression(const char *expression, StackFrame *frame_ptr, uint64_t *result)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
     if (log)
-        log->Printf("RenderScriptRuntime::EvalRSExpression(%s)", expression);
+        log->Printf("%s(%s)", __FUNCTION__, expression);
 
     ValueObjectSP expr_result;
     // Perform the actual expression evaluation
@@ -1340,9 +1336,9 @@ RenderScriptRuntime::EvalRSExpression(const char* expression, StackFrame* frame_
 
     if (!expr_result)
     {
-       if (log)
-           log->Printf("RenderScriptRuntime::EvalRSExpression -  Error: Couldn't evaluate expression");
-       return false;
+        if (log)
+            log->Printf("%s: couldn't evaluate expression.", __FUNCTION__);
+        return false;
     }
 
     // The result of the expression is invalid
@@ -1352,25 +1348,26 @@ RenderScriptRuntime::EvalRSExpression(const char* expression, StackFrame* frame_
         if (err.GetError() == UserExpression::kNoResult) // Expression returned void, so this is actually a success
         {
             if (log)
-                log->Printf("RenderScriptRuntime::EvalRSExpression - Expression returned void");
+                log->Printf("%s - expression returned void.", __FUNCTION__);
 
             result = nullptr;
             return true;
         }
 
         if (log)
-            log->Printf("RenderScriptRuntime::EvalRSExpression - Error evaluating expression result: %s", err.AsCString());
+            log->Printf("%s - error evaluating expression result: %s", __FUNCTION__,
+                        err.AsCString());
         return false;
     }
 
     bool success = false;
-    *result = expr_result->GetValueAsUnsigned(0, &success); // We only read the result as an unsigned int.
+    *result = expr_result->GetValueAsUnsigned(0, &success); // We only read the result as an uint32_t.
 
     if (!success)
     {
-       if (log)
-           log->Printf("RenderScriptRuntime::EvalRSExpression -  Error: Couldn't convert expression result to unsigned int");
-       return false;
+        if (log)
+            log->Printf("%s - couldn't convert expression result to uint32_t", __FUNCTION__);
+        return false;
     }
 
     return true;
@@ -1437,33 +1434,33 @@ const char runtimeExpressions[][256] =
 // Then sets the data_ptr member in Allocation with the result.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITDataPointer(AllocationDetails* allocation, StackFrame* frame_ptr,
-                                    unsigned int x, unsigned int y, unsigned int z)
+RenderScriptRuntime::JITDataPointer(AllocationDetails *allocation, StackFrame *frame_ptr, uint32_t x,
+                                    uint32_t y, uint32_t z)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!allocation->address.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITDataPointer - Failed to find allocation details");
+            log->Printf("%s - failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
     const char* expr_cstr = runtimeExpressions[eExprGetOffsetPtr];
-    const int max_expr_size = 512; // Max expression size
+    const int max_expr_size = 512;
     char buffer[max_expr_size];
 
     int chars_written = snprintf(buffer, max_expr_size, expr_cstr, *allocation->address.get(), x, y, z);
     if (chars_written < 0)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITDataPointer - Encoding error in snprintf()");
+            log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
         return false;
     }
     else if (chars_written >= max_expr_size)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITDataPointer - Expression too long");
+            log->Printf("%s - expression too long.", __FUNCTION__);
         return false;
     }
 
@@ -1481,14 +1478,14 @@ RenderScriptRuntime::JITDataPointer(AllocationDetails* allocation, StackFrame* f
 // Then sets the type_ptr member in Allocation with the result.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITTypePointer(AllocationDetails* allocation, StackFrame* frame_ptr)
+RenderScriptRuntime::JITTypePointer(AllocationDetails *allocation, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!allocation->address.isValid() || !allocation->context.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITTypePointer - Failed to find allocation details");
+            log->Printf("%s - failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
@@ -1500,13 +1497,13 @@ RenderScriptRuntime::JITTypePointer(AllocationDetails* allocation, StackFrame* f
     if (chars_written < 0)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITDataPointer - Encoding error in snprintf()");
+            log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
         return false;
     }
     else if (chars_written >= max_expr_size)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITTypePointer - Expression too long");
+            log->Printf("%s - expression too long.", __FUNCTION__);
         return false;
     }
 
@@ -1524,43 +1521,43 @@ RenderScriptRuntime::JITTypePointer(AllocationDetails* allocation, StackFrame* f
 // Then sets dimension and element_ptr members in Allocation with the result.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITTypePacked(AllocationDetails* allocation, StackFrame* frame_ptr)
+RenderScriptRuntime::JITTypePacked(AllocationDetails *allocation, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!allocation->type_ptr.isValid() || !allocation->context.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITTypePacked - Failed to find allocation details");
+            log->Printf("%s - Failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
     // Expression is different depending on if device is 32 or 64 bit
     uint32_t archByteSize = GetProcess()->GetTarget().GetArchitecture().GetAddressByteSize();
-    const unsigned int bits = archByteSize == 4 ? 32 : 64;
+    const uint32_t bits = archByteSize == 4 ? 32 : 64;
 
     // We want 4 elements from packed data
-    const unsigned int num_exprs = 4;
+    const uint32_t num_exprs = 4;
     assert(num_exprs == (eExprTypeElemPtr - eExprTypeDimX + 1) && "Invalid number of expressions");
 
-    const int max_expr_size = 512; // Max expression size
+    const int max_expr_size = 512;
     char buffer[num_exprs][max_expr_size];
     uint64_t results[num_exprs];
 
-    for (unsigned int i = 0; i < num_exprs; ++i)
+    for (uint32_t i = 0; i < num_exprs; ++i)
     {
         int chars_written = snprintf(buffer[i], max_expr_size, runtimeExpressions[eExprTypeDimX + i], bits,
                                      *allocation->context.get(), *allocation->type_ptr.get());
         if (chars_written < 0)
         {
             if (log)
-                log->Printf("RenderScriptRuntime::JITDataPointer - Encoding error in snprintf()");
+                log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
             return false;
         }
         else if (chars_written >= max_expr_size)
         {
             if (log)
-                log->Printf("RenderScriptRuntime::JITTypePacked - Expression too long");
+                log->Printf("%s - expression too long.", __FUNCTION__);
             return false;
         }
 
@@ -1580,7 +1577,7 @@ RenderScriptRuntime::JITTypePacked(AllocationDetails* allocation, StackFrame* fr
     allocation->element.element_ptr = elem_ptr;
 
     if (log)
-        log->Printf("RenderScriptRuntime::JITTypePacked - dims (%u, %u, %u) Element*: 0x%" PRIx64,
+        log->Printf("%s - dims (%" PRIu32 ", %" PRIu32 ", %" PRIu32 ") Element*: 0x%" PRIx64 ".", __FUNCTION__,
                     dims.dim_1, dims.dim_2, dims.dim_3, elem_ptr);
 
     return true;
@@ -1590,38 +1587,39 @@ RenderScriptRuntime::JITTypePacked(AllocationDetails* allocation, StackFrame* fr
 // Then sets type, type_vec_size, field_count and type_kind members in Element with the result.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITElementPacked(Element& elem, const lldb::addr_t context, StackFrame* frame_ptr)
+RenderScriptRuntime::JITElementPacked(Element &elem, const lldb::addr_t context, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!elem.element_ptr.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITElementPacked - Failed to find allocation details");
+            log->Printf("%s - failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
     // We want 4 elements from packed data
-    const unsigned int num_exprs = 4;
+    const uint32_t num_exprs = 4;
     assert(num_exprs == (eExprElementFieldCount - eExprElementType + 1) && "Invalid number of expressions");
 
-    const int max_expr_size = 512; // Max expression size
+    const int max_expr_size = 512;
     char buffer[num_exprs][max_expr_size];
     uint64_t results[num_exprs];
 
-    for (unsigned int i = 0; i < num_exprs; i++)
+    for (uint32_t i = 0; i < num_exprs; i++)
     {
-        int chars_written = snprintf(buffer[i], max_expr_size, runtimeExpressions[eExprElementType + i], context, *elem.element_ptr.get());
+        int chars_written = snprintf(buffer[i], max_expr_size, runtimeExpressions[eExprElementType + i],
+                                     context, *elem.element_ptr.get());
         if (chars_written < 0)
         {
             if (log)
-                log->Printf("RenderScriptRuntime::JITElementPacked - Encoding error in snprintf()");
+                log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
             return false;
         }
         else if (chars_written >= max_expr_size)
         {
             if (log)
-                log->Printf("RenderScriptRuntime::JITElementPacked - Expression too long");
+                log->Printf("%s - expression too long.", __FUNCTION__);
             return false;
         }
 
@@ -1637,8 +1635,8 @@ RenderScriptRuntime::JITElementPacked(Element& elem, const lldb::addr_t context,
     elem.field_count = static_cast<uint32_t>(results[3]);
 
     if (log)
-        log->Printf("RenderScriptRuntime::JITElementPacked - data type %u, pixel type %u, vector size %u, field count %u",
-                    *elem.type.get(), *elem.type_kind.get(), *elem.type_vec_size.get(), *elem.field_count.get());
+        log->Printf("%s - data type %" PRIu32 ", pixel type %" PRIu32 ", vector size %" PRIu32 ", field count %" PRIu32,
+                    __FUNCTION__, *elem.type.get(), *elem.type_kind.get(), *elem.type_vec_size.get(), *elem.field_count.get());
 
     // If this Element has subelements then JIT rsaElementGetSubElements() for details about its fields
     if (*elem.field_count.get() > 0 && !JITSubelements(elem, context, frame_ptr))
@@ -1651,30 +1649,30 @@ RenderScriptRuntime::JITElementPacked(Element& elem, const lldb::addr_t context,
 // This is necessary for infering the struct type so we can pretty print the allocation's contents.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITSubelements(Element& elem, const lldb::addr_t context, StackFrame* frame_ptr)
+RenderScriptRuntime::JITSubelements(Element &elem, const lldb::addr_t context, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!elem.element_ptr.isValid() || !elem.field_count.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITSubelements - Failed to find allocation details");
+            log->Printf("%s - failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
     const short num_exprs = 3;
     assert(num_exprs == (eExprSubelementsArrSize - eExprSubelementsId + 1) && "Invalid number of expressions");
 
-    const int max_expr_size = 512; // Max expression size
+    const int max_expr_size = 512;
     char expr_buffer[max_expr_size];
     uint64_t results;
 
     // Iterate over struct fields.
     const uint32_t field_count = *elem.field_count.get();
-    for (unsigned int field_index = 0; field_index < field_count; ++field_index)
+    for (uint32_t field_index = 0; field_index < field_count; ++field_index)
     {
         Element child;
-        for (unsigned int expr_index = 0; expr_index < num_exprs; ++expr_index)
+        for (uint32_t expr_index = 0; expr_index < num_exprs; ++expr_index)
         {
             int chars_written = snprintf(expr_buffer, max_expr_size, runtimeExpressions[eExprSubelementsId + expr_index],
                                          field_count, field_count, field_count,
@@ -1682,13 +1680,13 @@ RenderScriptRuntime::JITSubelements(Element& elem, const lldb::addr_t context, S
             if (chars_written < 0)
             {
                 if (log)
-                    log->Printf("RenderScriptRuntime::JITSubelements - Encoding error in snprintf()");
+                    log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
                 return false;
             }
             else if (chars_written >= max_expr_size)
             {
                 if (log)
-                    log->Printf("RenderScriptRuntime::JITSubelements - Expression too long");
+                    log->Printf("%s - expression too long.", __FUNCTION__);
                 return false;
             }
 
@@ -1697,9 +1695,9 @@ RenderScriptRuntime::JITSubelements(Element& elem, const lldb::addr_t context, S
                 return false;
 
             if (log)
-                log->Printf("RenderScriptRuntime::JITSubelements - Expr result 0x%" PRIx64, results);
+                log->Printf("%s - expr result 0x%" PRIx64 ".", __FUNCTION__, results);
 
-            switch(expr_index)
+            switch (expr_index)
             {
                 case 0: // Element* of child
                     child.element_ptr = static_cast<addr_t>(results);
@@ -1715,7 +1713,7 @@ RenderScriptRuntime::JITSubelements(Element& elem, const lldb::addr_t context, S
                     else
                     {
                         if (log)
-                            log->Printf("RenderScriptRuntime::JITSubelements - Warning: Couldn't read field name");
+                            log->Printf("%s - warning: Couldn't read field name.", __FUNCTION__);
                     }
                     break;
                 }
@@ -1744,22 +1742,22 @@ RenderScriptRuntime::JITSubelements(Element& elem, const lldb::addr_t context, S
 // Using this offset minus the starting address we can calculate the size of the allocation.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITAllocationSize(AllocationDetails* allocation, StackFrame* frame_ptr)
+RenderScriptRuntime::JITAllocationSize(AllocationDetails *allocation, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
-    if (!allocation->address.isValid() || !allocation->dimension.isValid()
-        || !allocation->data_ptr.isValid() || !allocation->element.datum_size.isValid())
+    if (!allocation->address.isValid() || !allocation->dimension.isValid() || !allocation->data_ptr.isValid() ||
+        !allocation->element.datum_size.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationSize - Failed to find allocation details");
+            log->Printf("%s - failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
     // Find dimensions
-    unsigned int dim_x = allocation->dimension.get()->dim_1;
-    unsigned int dim_y = allocation->dimension.get()->dim_2;
-    unsigned int dim_z = allocation->dimension.get()->dim_3;
+    uint32_t dim_x = allocation->dimension.get()->dim_1;
+    uint32_t dim_y = allocation->dimension.get()->dim_2;
+    uint32_t dim_z = allocation->dimension.get()->dim_3;
 
     // Our plan of jitting the last element address doesn't seem to work for struct Allocations
     // Instead try to infer the size ourselves without any inter element padding.
@@ -1772,8 +1770,8 @@ RenderScriptRuntime::JITAllocationSize(AllocationDetails* allocation, StackFrame
         allocation->size = dim_x * dim_y * dim_z * *allocation->element.datum_size.get();
 
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationSize - Infered size of struct allocation %u", *allocation->size.get());
-
+            log->Printf("%s - infered size of struct allocation %" PRIu32 ".", __FUNCTION__,
+                        *allocation->size.get());
         return true;
     }
 
@@ -1791,13 +1789,13 @@ RenderScriptRuntime::JITAllocationSize(AllocationDetails* allocation, StackFrame
     if (chars_written < 0)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationSize - Encoding error in snprintf()");
+            log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
         return false;
     }
     else if (chars_written >= max_expr_size)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationSize - Expression too long");
+            log->Printf("%s - expression too long.", __FUNCTION__);
         return false;
     }
 
@@ -1807,7 +1805,8 @@ RenderScriptRuntime::JITAllocationSize(AllocationDetails* allocation, StackFrame
 
     addr_t mem_ptr = static_cast<lldb::addr_t>(result);
     // Find pointer to last element and add on size of an element
-    allocation->size = static_cast<uint32_t>(mem_ptr - *allocation->data_ptr.get()) + *allocation->element.datum_size.get();
+    allocation->size =
+        static_cast<uint32_t>(mem_ptr - *allocation->data_ptr.get()) + *allocation->element.datum_size.get();
 
     return true;
 }
@@ -1816,19 +1815,19 @@ RenderScriptRuntime::JITAllocationSize(AllocationDetails* allocation, StackFrame
 // This is done to detect padding, since allocated memory is 16-byte aligned.
 // Returns true on success, false otherwise
 bool
-RenderScriptRuntime::JITAllocationStride(AllocationDetails* allocation, StackFrame* frame_ptr)
+RenderScriptRuntime::JITAllocationStride(AllocationDetails *allocation, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!allocation->address.isValid() || !allocation->data_ptr.isValid())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationStride - Failed to find allocation details");
+            log->Printf("%s - failed to find allocation details.", __FUNCTION__);
         return false;
     }
 
     const char* expr_cstr = runtimeExpressions[eExprGetOffsetPtr];
-    const int max_expr_size = 512; // Max expression size
+    const int max_expr_size = 512;
     char buffer[max_expr_size];
 
     int chars_written = snprintf(buffer, max_expr_size, expr_cstr, *allocation->address.get(),
@@ -1836,13 +1835,13 @@ RenderScriptRuntime::JITAllocationStride(AllocationDetails* allocation, StackFra
     if (chars_written < 0)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationStride - Encoding error in snprintf()");
+            log->Printf("%s - encoding error in snprintf().", __FUNCTION__);
         return false;
     }
     else if (chars_written >= max_expr_size)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::JITAllocationStride - Expression too long");
+            log->Printf("%s - expression too long.", __FUNCTION__);
         return false;
     }
 
@@ -1858,7 +1857,7 @@ RenderScriptRuntime::JITAllocationStride(AllocationDetails* allocation, StackFra
 
 // JIT all the current runtime info regarding an allocation
 bool
-RenderScriptRuntime::RefreshAllocation(AllocationDetails* allocation, StackFrame* frame_ptr)
+RenderScriptRuntime::RefreshAllocation(AllocationDetails *allocation, StackFrame *frame_ptr)
 {
     // GetOffsetPointer()
     if (!JITDataPointer(allocation, frame_ptr))
@@ -1890,9 +1889,9 @@ RenderScriptRuntime::RefreshAllocation(AllocationDetails* allocation, StackFrame
 // This string should be the name of the struct type the Element represents.
 // We need this string for pretty printing the Element to users.
 void
-RenderScriptRuntime::FindStructTypeName(Element& elem, StackFrame* frame_ptr)
+RenderScriptRuntime::FindStructTypeName(Element &elem, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (!elem.type_name.IsEmpty()) // Name already set
         return;
@@ -1911,7 +1910,7 @@ RenderScriptRuntime::FindStructTypeName(Element& elem, StackFrame* frame_ptr)
     {
         const VariableSP var_sp(variable_list.GetVariableAtIndex(var_index));
         if (!var_sp)
-           continue;
+            continue;
 
         ValueObjectSP valobj_sp = ValueObjectVariable::Create(frame_ptr, var_sp);
         if (!valobj_sp)
@@ -1942,13 +1941,13 @@ RenderScriptRuntime::FindStructTypeName(Element& elem, StackFrame* frame_ptr)
         // RS can add extra struct members for padding in the format '#rs_padding_[0-9]+'
         if (found && num_children < elem.children.size())
         {
-            const unsigned int size_diff = elem.children.size() - num_children;
+            const uint32_t size_diff = elem.children.size() - num_children;
             if (log)
-                log->Printf("RenderScriptRuntime::FindStructTypeName - %u padding struct entries", size_diff);
+                log->Printf("%s - %" PRIu32 " padding struct entries", __FUNCTION__, size_diff);
 
-            for (unsigned int padding_index = 0; padding_index < size_diff; ++padding_index)
+            for (uint32_t padding_index = 0; padding_index < size_diff; ++padding_index)
             {
-                const ConstString& name = elem.children[num_children + padding_index].type_name;
+                const ConstString &name = elem.children[num_children + padding_index].type_name;
                 if (strcmp(name.AsCString(), "#rs_padding") < 0)
                     found = false;
             }
@@ -1969,7 +1968,7 @@ RenderScriptRuntime::FindStructTypeName(Element& elem, StackFrame* frame_ptr)
             // Save name of variable in Element.
             elem.type_name = valobj_sp->GetTypeName();
             if (log)
-                log->Printf("RenderScriptRuntime::FindStructTypeName - Element name set to %s", elem.type_name.AsCString());
+                log->Printf("%s - element name set to %s", __FUNCTION__, elem.type_name.AsCString());
 
             return;
         }
@@ -1979,29 +1978,30 @@ RenderScriptRuntime::FindStructTypeName(Element& elem, StackFrame* frame_ptr)
 // Function sets the datum_size member of Element. Representing the size of a single instance including padding.
 // Assumes the relevant allocation information has already been jitted.
 void
-RenderScriptRuntime::SetElementSize(Element& elem)
+RenderScriptRuntime::SetElementSize(Element &elem)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
     const Element::DataType type = *elem.type.get();
-    assert(type >= Element::RS_TYPE_NONE && type <= Element::RS_TYPE_FONT
-                                                   && "Invalid allocation type");
+    assert(type >= Element::RS_TYPE_NONE && type <= Element::RS_TYPE_FONT && "Invalid allocation type");
 
-    const unsigned int vec_size = *elem.type_vec_size.get();
-    unsigned int data_size = 0;
-    unsigned int padding = 0;
+    const uint32_t vec_size = *elem.type_vec_size.get();
+    uint32_t data_size = 0;
+    uint32_t padding = 0;
 
     // Element is of a struct type, calculate size recursively.
     if ((type == Element::RS_TYPE_NONE) && (elem.children.size() > 0))
     {
-        for (Element& child : elem.children)
+        for (Element &child : elem.children)
         {
             SetElementSize(child);
-            const unsigned int array_size = child.array_size.isValid() ? *child.array_size.get() : 1;
+            const uint32_t array_size = child.array_size.isValid() ? *child.array_size.get() : 1;
             data_size += *child.datum_size.get() * array_size;
         }
     }
-    else if (type == Element::RS_TYPE_UNSIGNED_5_6_5 || type == Element::RS_TYPE_UNSIGNED_5_5_5_1 ||
-             type == Element::RS_TYPE_UNSIGNED_4_4_4_4) // These have been packed already
+    // These have been packed already
+    else if (type == Element::RS_TYPE_UNSIGNED_5_6_5   ||
+             type == Element::RS_TYPE_UNSIGNED_5_5_5_1 ||
+             type == Element::RS_TYPE_UNSIGNED_4_4_4_4)
     {
         data_size = AllocationDetails::RSTypeToFormat[type][eElementSize];
     }
@@ -2017,40 +2017,41 @@ RenderScriptRuntime::SetElementSize(Element& elem)
     elem.padding = padding;
     elem.datum_size = data_size + padding;
     if (log)
-        log->Printf("RenderScriptRuntime::SetElementSize - element size set to %u", data_size + padding);
+        log->Printf("%s - element size set to %" PRIu32, __FUNCTION__, data_size + padding);
 }
 
 // Given an allocation, this function copies the allocation contents from device into a buffer on the heap.
 // Returning a shared pointer to the buffer containing the data.
 std::shared_ptr<uint8_t>
-RenderScriptRuntime::GetAllocationData(AllocationDetails* allocation, StackFrame* frame_ptr)
+RenderScriptRuntime::GetAllocationData(AllocationDetails *allocation, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     // JIT all the allocation details
     if (allocation->shouldRefresh())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetAllocationData - Allocation details not calculated yet, jitting info");
+            log->Printf("%s - allocation details not calculated yet, jitting info", __FUNCTION__);
 
         if (!RefreshAllocation(allocation, frame_ptr))
         {
             if (log)
-                log->Printf("RenderScriptRuntime::GetAllocationData - Couldn't JIT allocation details");
+                log->Printf("%s - couldn't JIT allocation details", __FUNCTION__);
             return nullptr;
         }
     }
 
-    assert(allocation->data_ptr.isValid() && allocation->element.type.isValid() && allocation->element.type_vec_size.isValid()
-           && allocation->size.isValid() && "Allocation information not available");
+    assert(allocation->data_ptr.isValid() && allocation->element.type.isValid() &&
+           allocation->element.type_vec_size.isValid() && allocation->size.isValid() &&
+           "Allocation information not available");
 
     // Allocate a buffer to copy data into
-    const unsigned int size = *allocation->size.get();
+    const uint32_t size = *allocation->size.get();
     std::shared_ptr<uint8_t> buffer(new uint8_t[size]);
     if (!buffer)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetAllocationData - Couldn't allocate a %u byte buffer", size);
+            log->Printf("%s - couldn't allocate a %" PRIu32 " byte buffer", __FUNCTION__, size);
         return nullptr;
     }
 
@@ -2061,8 +2062,8 @@ RenderScriptRuntime::GetAllocationData(AllocationDetails* allocation, StackFrame
     if (error.Fail())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetAllocationData - '%s' Couldn't read %u bytes of allocation data from 0x%" PRIx64,
-                        error.AsCString(), size, data_ptr);
+            log->Printf("%s - '%s' Couldn't read %" PRIu32 " bytes of allocation data from 0x%" PRIx64,
+                        __FUNCTION__, error.AsCString(), size, data_ptr);
         return nullptr;
     }
 
@@ -2073,34 +2074,34 @@ RenderScriptRuntime::GetAllocationData(AllocationDetails* allocation, StackFrame
 // There is a header at the start of the file, FileHeader, before the data content itself.
 // Information from this header is used to display warnings to the user about incompatabilities
 bool
-RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const char* filename, StackFrame* frame_ptr)
+RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const char *filename, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     // Find allocation with the given id
-    AllocationDetails* alloc = FindAllocByID(strm, alloc_id);
+    AllocationDetails *alloc = FindAllocByID(strm, alloc_id);
     if (!alloc)
         return false;
 
     if (log)
-        log->Printf("RenderScriptRuntime::LoadAllocation - Found allocation 0x%" PRIx64, *alloc->address.get());
+        log->Printf("%s - found allocation 0x%" PRIx64, __FUNCTION__, *alloc->address.get());
 
     // JIT all the allocation details
     if (alloc->shouldRefresh())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::LoadAllocation - Allocation details not calculated yet, jitting info");
+            log->Printf("%s - allocation details not calculated yet, jitting info.", __FUNCTION__);
 
         if (!RefreshAllocation(alloc, frame_ptr))
         {
             if (log)
-                log->Printf("RenderScriptRuntime::LoadAllocation - Couldn't JIT allocation details");
+                log->Printf("%s - couldn't JIT allocation details", __FUNCTION__);
             return false;
         }
     }
 
-    assert(alloc->data_ptr.isValid() && alloc->element.type.isValid() && alloc->element.type_vec_size.isValid()
-           && alloc->size.isValid() && alloc->element.datum_size.isValid() && "Allocation information not available");
+    assert(alloc->data_ptr.isValid() && alloc->element.type.isValid() && alloc->element.type_vec_size.isValid() &&
+           alloc->size.isValid() && alloc->element.datum_size.isValid() && "Allocation information not available");
 
     // Check we can read from file
     FileSpec file(filename, true);
@@ -2122,19 +2123,18 @@ RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const
     DataBufferSP data_sp(file.ReadFileContents());
 
     // Cast start of buffer to FileHeader and use pointer to read metadata
-    void* file_buffer = data_sp->GetBytes();
-    if (file_buffer == NULL || data_sp->GetByteSize() <
-        (sizeof(AllocationDetails::FileHeader) + sizeof(AllocationDetails::ElementHeader)))
+    void *file_buffer = data_sp->GetBytes();
+    if (file_buffer == nullptr ||
+        data_sp->GetByteSize() < (sizeof(AllocationDetails::FileHeader) + sizeof(AllocationDetails::ElementHeader)))
     {
         strm.Printf("Error: File %s does not contain enough data for header", filename);
         strm.EOL();
         return false;
     }
-    const AllocationDetails::FileHeader* file_header = static_cast<AllocationDetails::FileHeader*>(file_buffer);
+    const AllocationDetails::FileHeader *file_header = static_cast<AllocationDetails::FileHeader *>(file_buffer);
 
     // Check file starts with ascii characters "RSAD"
-    if (file_header->ident[0] != 'R' || file_header->ident[1] != 'S' || file_header->ident[2] != 'A'
-        || file_header->ident[3] != 'D')
+    if (memcmp(file_header->ident, "RSAD", 4))
     {
         strm.Printf("Error: File doesn't contain identifier for an RS allocation dump. Are you sure this is the correct file?");
         strm.EOL();
@@ -2143,24 +2143,24 @@ RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const
 
     // Look at the type of the root element in the header
     AllocationDetails::ElementHeader root_element_header;
-    memcpy(&root_element_header, static_cast<uint8_t*>(file_buffer) + sizeof(AllocationDetails::FileHeader),
+    memcpy(&root_element_header, static_cast<uint8_t *>(file_buffer) + sizeof(AllocationDetails::FileHeader),
            sizeof(AllocationDetails::ElementHeader));
 
     if (log)
-        log->Printf("RenderScriptRuntime::LoadAllocation - header type %u, element size %u",
+        log->Printf("%s - header type %" PRIu32 ", element size %" PRIu32, __FUNCTION__,
                     root_element_header.type, root_element_header.element_size);
 
     // Check if the target allocation and file both have the same number of bytes for an Element
     if (*alloc->element.datum_size.get() != root_element_header.element_size)
     {
-        strm.Printf("Warning: Mismatched Element sizes - file %u bytes, allocation %u bytes",
+        strm.Printf("Warning: Mismatched Element sizes - file %" PRIu32 " bytes, allocation %" PRIu32 " bytes",
                     root_element_header.element_size, *alloc->element.datum_size.get());
         strm.EOL();
     }
 
     // Check if the target allocation and file both have the same type
-    const unsigned int alloc_type = static_cast<unsigned int>(*alloc->element.type.get());
-    const unsigned int file_type = root_element_header.type;
+    const uint32_t alloc_type = static_cast<uint32_t>(*alloc->element.type.get());
+    const uint32_t file_type = root_element_header.type;
 
     if (file_type > Element::RS_TYPE_FONT)
     {
@@ -2170,36 +2170,36 @@ RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const
     else if (alloc_type != file_type)
     {
         // Enum value isn't monotonous, so doesn't always index RsDataTypeToString array
-        unsigned int printable_target_type_index = alloc_type;
-        unsigned int printable_head_type_index = file_type;
+        uint32_t printable_target_type_index = alloc_type;
+        uint32_t printable_head_type_index = file_type;
         if (alloc_type >= Element::RS_TYPE_ELEMENT && alloc_type <= Element::RS_TYPE_FONT)
-            printable_target_type_index = static_cast<Element::DataType>(
-                                         (alloc_type - Element::RS_TYPE_ELEMENT) + Element::RS_TYPE_MATRIX_2X2 + 1);
+            printable_target_type_index = static_cast<Element::DataType>((alloc_type - Element::RS_TYPE_ELEMENT) +
+                                                                         Element::RS_TYPE_MATRIX_2X2 + 1);
 
         if (file_type >= Element::RS_TYPE_ELEMENT && file_type <= Element::RS_TYPE_FONT)
-            printable_head_type_index = static_cast<Element::DataType>(
-                                        (file_type - Element::RS_TYPE_ELEMENT) + Element::RS_TYPE_MATRIX_2X2 + 1);
+            printable_head_type_index = static_cast<Element::DataType>((file_type - Element::RS_TYPE_ELEMENT) +
+                                                                       Element::RS_TYPE_MATRIX_2X2 + 1);
 
-        const char* file_type_cstr = AllocationDetails::RsDataTypeToString[printable_head_type_index][0];
-        const char* target_type_cstr = AllocationDetails::RsDataTypeToString[printable_target_type_index][0];
+        const char *file_type_cstr = AllocationDetails::RsDataTypeToString[printable_head_type_index][0];
+        const char *target_type_cstr = AllocationDetails::RsDataTypeToString[printable_target_type_index][0];
 
-        strm.Printf("Warning: Mismatched Types - file '%s' type, allocation '%s' type",
-                    file_type_cstr, target_type_cstr);
+        strm.Printf("Warning: Mismatched Types - file '%s' type, allocation '%s' type", file_type_cstr,
+                    target_type_cstr);
         strm.EOL();
     }
 
     // Advance buffer past header
-    file_buffer = static_cast<uint8_t*>(file_buffer) + file_header->hdr_size;
+    file_buffer = static_cast<uint8_t *>(file_buffer) + file_header->hdr_size;
 
     // Calculate size of allocation data in file
     size_t length = data_sp->GetByteSize() - file_header->hdr_size;
 
     // Check if the target allocation and file both have the same total data size.
-    const unsigned int alloc_size = *alloc->size.get();
+    const uint32_t alloc_size = *alloc->size.get();
     if (alloc_size != length)
     {
-        strm.Printf("Warning: Mismatched allocation sizes - file 0x%" PRIx64 " bytes, allocation 0x%x bytes",
-                    (uint64_t) length, alloc_size);
+        strm.Printf("Warning: Mismatched allocation sizes - file 0x%" PRIx64 " bytes, allocation 0x%" PRIx32 " bytes",
+                    (uint64_t)length, alloc_size);
         strm.EOL();
         length = alloc_size < length ? alloc_size : length; // Set length to copy to minimum
     }
@@ -2215,7 +2215,7 @@ RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const
         return false;
     }
 
-    strm.Printf("Contents of file '%s' read into allocation %u", filename, alloc->id);
+    strm.Printf("Contents of file '%s' read into allocation %" PRIu32, filename, alloc->id);
     strm.EOL();
 
     return true;
@@ -2224,9 +2224,11 @@ RenderScriptRuntime::LoadAllocation(Stream &strm, const uint32_t alloc_id, const
 // Function takes as parameters a byte buffer, which will eventually be written to file as the element header,
 // an offset into that buffer, and an Element that will be saved into the buffer at the parametrised offset.
 // Return value is the new offset after writing the element into the buffer.
-// Elements are saved to the file as the ElementHeader struct followed by offsets to the structs of all the element's children.
+// Elements are saved to the file as the ElementHeader struct followed by offsets to the structs of all the element's
+// children.
 size_t
-RenderScriptRuntime::PopulateElementHeaders(const std::shared_ptr<uint8_t> header_buffer, size_t offset, const Element& elem)
+RenderScriptRuntime::PopulateElementHeaders(const std::shared_ptr<uint8_t> header_buffer, size_t offset,
+                                            const Element &elem)
 {
     // File struct for an element header with all the relevant details copied from elem.
     // We assume members are valid already.
@@ -2239,13 +2241,13 @@ RenderScriptRuntime::PopulateElementHeaders(const std::shared_ptr<uint8_t> heade
     const size_t elem_header_size = sizeof(AllocationDetails::ElementHeader);
 
     // Copy struct into buffer and advance offset
-    // We assume that header_buffer has been checked for NULL before this method is called
+    // We assume that header_buffer has been checked for nullptr before this method is called
     memcpy(header_buffer.get() + offset, &elem_header, elem_header_size);
     offset += elem_header_size;
 
     // Starting offset of child ElementHeader struct
     size_t child_offset = offset + ((elem.children.size() + 1) * sizeof(uint32_t));
-    for (const RenderScriptRuntime::Element& child : elem.children)
+    for (const RenderScriptRuntime::Element &child : elem.children)
     {
         // Recursively populate the buffer with the element header structs of children.
         // Then save the offsets where they were set after the parent element header.
@@ -2261,17 +2263,18 @@ RenderScriptRuntime::PopulateElementHeaders(const std::shared_ptr<uint8_t> heade
     return child_offset;
 }
 
-// Given an Element object this function returns the total size needed in the file header to store the element's details.
+// Given an Element object this function returns the total size needed in the file header to store the element's
+// details.
 // Taking into account the size of the element header struct, plus the offsets to all the element's children.
 // Function is recursive so that the size of all ancestors is taken into account.
 size_t
-RenderScriptRuntime::CalculateElementHeaderSize(const Element& elem)
+RenderScriptRuntime::CalculateElementHeaderSize(const Element &elem)
 {
     size_t size = (elem.children.size() + 1) * sizeof(uint32_t); // Offsets to children plus zero terminator
-    size += sizeof(AllocationDetails::ElementHeader); // Size of header struct with type details
+    size += sizeof(AllocationDetails::ElementHeader);            // Size of header struct with type details
 
     // Calculate recursively for all descendants
-    for (const Element& child : elem.children)
+    for (const Element &child : elem.children)
         size += CalculateElementHeaderSize(child);
 
     return size;
@@ -2281,34 +2284,35 @@ RenderScriptRuntime::CalculateElementHeaderSize(const Element& elem)
 // This file can then be loaded later into a different allocation.
 // There is a header, FileHeader, before the allocation data containing meta-data.
 bool
-RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const char* filename, StackFrame* frame_ptr)
+RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const char *filename, StackFrame *frame_ptr)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     // Find allocation with the given id
-    AllocationDetails* alloc = FindAllocByID(strm, alloc_id);
+    AllocationDetails *alloc = FindAllocByID(strm, alloc_id);
     if (!alloc)
         return false;
 
     if (log)
-        log->Printf("RenderScriptRuntime::SaveAllocation - Found allocation 0x%" PRIx64, *alloc->address.get());
+        log->Printf("%s - found allocation 0x%" PRIx64 ".", __FUNCTION__, *alloc->address.get());
 
-     // JIT all the allocation details
+    // JIT all the allocation details
     if (alloc->shouldRefresh())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::SaveAllocation - Allocation details not calculated yet, jitting info");
+            log->Printf("%s - allocation details not calculated yet, jitting info.", __FUNCTION__);
 
         if (!RefreshAllocation(alloc, frame_ptr))
         {
             if (log)
-                log->Printf("RenderScriptRuntime::SaveAllocation - Couldn't JIT allocation details");
+                log->Printf("%s - couldn't JIT allocation details.", __FUNCTION__);
             return false;
         }
     }
 
-    assert(alloc->data_ptr.isValid() && alloc->element.type.isValid() && alloc->element.type_vec_size.isValid() && alloc->element.datum_size.get()
-           && alloc->element.type_kind.isValid() && alloc->dimension.isValid() && "Allocation information not available");
+    assert(alloc->data_ptr.isValid() && alloc->element.type.isValid() && alloc->element.type_vec_size.isValid() &&
+           alloc->element.datum_size.get() && alloc->element.type_kind.isValid() && alloc->dimension.isValid() &&
+           "Allocation information not available");
 
     // Check we can create writable file
     FileSpec file_spec(filename, true);
@@ -2331,7 +2335,7 @@ RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const
 
     // Create the file header
     AllocationDetails::FileHeader head;
-    head.ident[0] = 'R'; head.ident[1] = 'S'; head.ident[2] = 'A'; head.ident[3] = 'D';
+    memcpy(head.ident, "RSAD", 4);
     head.dims[0] = static_cast<uint32_t>(alloc->dimension.get()->dim_1);
     head.dims[1] = static_cast<uint32_t>(alloc->dimension.get()->dim_2);
     head.dims[2] = static_cast<uint32_t>(alloc->dimension.get()->dim_3);
@@ -2343,7 +2347,7 @@ RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const
     // Write the file header
     size_t num_bytes = sizeof(AllocationDetails::FileHeader);
     if (log)
-        log->Printf("RenderScriptRuntime::SaveAllocation - Writing File Header, 0x%zX bytes", num_bytes);
+        log->Printf("%s - writing File Header, 0x%" PRIx64 " bytes", __FUNCTION__, num_bytes);
 
     Error err = file.Write(&head, num_bytes);
     if (!err.Success())
@@ -2357,7 +2361,7 @@ RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const
     std::shared_ptr<uint8_t> element_header_buffer(new uint8_t[element_header_size]);
     if (element_header_buffer == nullptr)
     {
-        strm.Printf("Internal Error: Couldn't allocate %zu bytes on the heap", element_header_size);
+        strm.Printf("Internal Error: Couldn't allocate %" PRIu64 " bytes on the heap", element_header_size);
         strm.EOL();
         return false;
     }
@@ -2367,7 +2371,7 @@ RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const
     // Write headers for allocation element type to file
     num_bytes = element_header_size;
     if (log)
-        log->Printf("RenderScriptRuntime::SaveAllocation - Writing Element Headers, 0x%zX bytes", num_bytes);
+        log->Printf("%s - writing element headers, 0x%" PRIx64 " bytes.", __FUNCTION__, num_bytes);
 
     err = file.Write(element_header_buffer.get(), num_bytes);
     if (!err.Success())
@@ -2380,7 +2384,7 @@ RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const
     // Write allocation data to file
     num_bytes = static_cast<size_t>(*alloc->size.get());
     if (log)
-        log->Printf("RenderScriptRuntime::SaveAllocation - Writing 0x%zX bytes", num_bytes);
+        log->Printf("%s - writing 0x%" PRIx64 " bytes", __FUNCTION__, num_bytes);
 
     err = file.Write(buffer.get(), num_bytes);
     if (!err.Success())
@@ -2398,7 +2402,7 @@ RenderScriptRuntime::SaveAllocation(Stream &strm, const uint32_t alloc_id, const
 bool
 RenderScriptRuntime::LoadModule(const lldb::ModuleSP &module_sp)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     if (module_sp)
     {
@@ -2452,7 +2456,8 @@ RenderScriptRuntime::LoadModule(const lldb::ModuleSP &module_sp)
                 {
                     m_libRS = module_sp;
                     static ConstString gDbgPresentStr("gDebuggerPresent");
-                    const Symbol* debug_present = m_libRS->FindFirstSymbolWithNameAndType(gDbgPresentStr, eSymbolTypeData);
+                    const Symbol *debug_present =
+                        m_libRS->FindFirstSymbolWithNameAndType(gDbgPresentStr, eSymbolTypeData);
                     if (debug_present)
                     {
                         Error error;
@@ -2460,21 +2465,22 @@ RenderScriptRuntime::LoadModule(const lldb::ModuleSP &module_sp)
                         Target &target = GetProcess()->GetTarget();
                         addr_t addr = debug_present->GetLoadAddress(&target);
                         GetProcess()->WriteMemory(addr, &flag, sizeof(flag), error);
-                        if(error.Success())
+                        if (error.Success())
                         {
                             if (log)
-                                log->Printf ("RenderScriptRuntime::LoadModule - Debugger present flag set on debugee");
+                                log->Printf("%s - debugger present flag set on debugee.", __FUNCTION__);
 
                             m_debuggerPresentFlagged = true;
                         }
                         else if (log)
                         {
-                            log->Printf ("RenderScriptRuntime::LoadModule - Error writing debugger present flags '%s' ", error.AsCString());
+                            log->Printf("%s - error writing debugger present flags '%s' ", __FUNCTION__,
+                                        error.AsCString());
                         }
                     }
                     else if (log)
                     {
-                        log->Printf ("RenderScriptRuntime::LoadModule - Error writing debugger present flags - symbol not found");
+                        log->Printf("%s - error writing debugger present flags - symbol not found", __FUNCTION__);
                     }
                 }
                 break;
@@ -2537,28 +2543,28 @@ RSModuleDescriptor::ParseRSInfo()
             std::string line = info_lines[offset];
             // Parse directives
             uint32_t numDefns = 0;
-            if (sscanf(line.c_str(), "exportVarCount: %u", &numDefns) == 1)
+            if (sscanf(line.c_str(), "exportVarCount: %" PRIu32 "", &numDefns) == 1)
             {
                 while (numDefns--)
                     m_globals.push_back(RSGlobalDescriptor(this, info_lines[++offset].c_str()));
             }
-            else if (sscanf(line.c_str(), "exportFuncCount: %u", &numDefns) == 1)
+            else if (sscanf(line.c_str(), "exportFuncCount: %" PRIu32 "", &numDefns) == 1)
             {
             }
-            else if (sscanf(line.c_str(), "exportForEachCount: %u", &numDefns) == 1)
+            else if (sscanf(line.c_str(), "exportForEachCount: %" PRIu32 "", &numDefns) == 1)
             {
                 char name[MAXLINE];
                 while (numDefns--)
                 {
                     uint32_t slot = 0;
                     name[0] = '\0';
-                    if (sscanf(info_lines[++offset].c_str(), "%u - %s", &slot, &name[0]) == 2)
+                    if (sscanf(info_lines[++offset].c_str(), "%" PRIu32 " - %s", &slot, &name[0]) == 2)
                     {
                         m_kernels.push_back(RSKernelDescriptor(this, name, slot));
                     }
                 }
             }
-            else if (sscanf(line.c_str(), "pragmaCount: %u", &numDefns) == 1)
+            else if (sscanf(line.c_str(), "pragmaCount: %" PRIu32 "", &numDefns) == 1)
             {
                 char name[MAXLINE];
                 char value[MAXLINE];
@@ -2566,14 +2572,13 @@ RSModuleDescriptor::ParseRSInfo()
                 {
                     name[0] = '\0';
                     value[0] = '\0';
-                    if (sscanf(info_lines[++offset].c_str(), "%s - %s", &name[0], &value[0]) != 0
-                        && (name[0] != '\0'))
+                    if (sscanf(info_lines[++offset].c_str(), "%s - %s", &name[0], &value[0]) != 0 && (name[0] != '\0'))
                     {
                         m_pragmas[std::string(name)] = value;
                     }
                 }
             }
-            else if (sscanf(line.c_str(), "objectSlotCount: %u", &numDefns) == 1)
+            else if (sscanf(line.c_str(), "objectSlotCount: %" PRIu32 "", &numDefns) == 1)
             {
             }
 
@@ -2644,7 +2649,7 @@ RenderScriptRuntime::DumpContexts(Stream &strm) const
 
     // Iterate over all of the currently discovered scripts.
     // Note: We cant push or pop from m_scripts inside this loop or it may invalidate script.
-    for (const auto & script : m_scripts)
+    for (const auto &script : m_scripts)
     {
         if (!script->context.isValid())
             continue;
@@ -2660,7 +2665,7 @@ RenderScriptRuntime::DumpContexts(Stream &strm) const
         }
     }
 
-    for (const auto& cRef : contextReferences)
+    for (const auto &cRef : contextReferences)
     {
         strm.Printf("Context 0x%" PRIx64 ": %" PRIu64 " script instances", cRef.first, cRef.second);
         strm.EOL();
@@ -2676,7 +2681,7 @@ RenderScriptRuntime::DumpKernels(Stream &strm) const
     strm.IndentMore();
     for (const auto &module : m_rsmodules)
     {
-        strm.Printf("Resource '%s':",module->m_resname.c_str());
+        strm.Printf("Resource '%s':", module->m_resname.c_str());
         strm.EOL();
         for (const auto &kernel : module->m_kernels)
         {
@@ -2687,32 +2692,31 @@ RenderScriptRuntime::DumpKernels(Stream &strm) const
     strm.IndentLess();
 }
 
-RenderScriptRuntime::AllocationDetails*
+RenderScriptRuntime::AllocationDetails *
 RenderScriptRuntime::FindAllocByID(Stream &strm, const uint32_t alloc_id)
 {
-    AllocationDetails* alloc = nullptr;
+    AllocationDetails *alloc = nullptr;
 
     // See if we can find allocation using id as an index;
-    if (alloc_id <= m_allocations.size() && alloc_id != 0
-        && m_allocations[alloc_id-1]->id == alloc_id)
+    if (alloc_id <= m_allocations.size() && alloc_id != 0 && m_allocations[alloc_id - 1]->id == alloc_id)
     {
-        alloc = m_allocations[alloc_id-1].get();
+        alloc = m_allocations[alloc_id - 1].get();
         return alloc;
     }
 
     // Fallback to searching
-    for (const auto & a : m_allocations)
+    for (const auto &a : m_allocations)
     {
-       if (a->id == alloc_id)
-       {
-           alloc = a.get();
-           break;
-       }
+        if (a->id == alloc_id)
+        {
+            alloc = a.get();
+            break;
+        }
     }
 
     if (alloc == nullptr)
     {
-        strm.Printf("Error: Couldn't find allocation with id matching %u", alloc_id);
+        strm.Printf("Error: Couldn't find allocation with id matching %" PRIu32, alloc_id);
         strm.EOL();
     }
 
@@ -2721,23 +2725,23 @@ RenderScriptRuntime::FindAllocByID(Stream &strm, const uint32_t alloc_id)
 
 // Prints the contents of an allocation to the output stream, which may be a file
 bool
-RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame* frame_ptr, const uint32_t id)
+RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame *frame_ptr, const uint32_t id)
 {
-    Log* log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_LANGUAGE));
 
     // Check we can find the desired allocation
-    AllocationDetails* alloc = FindAllocByID(strm, id);
+    AllocationDetails *alloc = FindAllocByID(strm, id);
     if (!alloc)
         return false; // FindAllocByID() will print error message for us here
 
     if (log)
-        log->Printf("RenderScriptRuntime::DumpAllocation - Found allocation 0x%" PRIx64, *alloc->address.get());
+        log->Printf("%s - found allocation 0x%" PRIx64, __FUNCTION__, *alloc->address.get());
 
     // Check we have information about the allocation, if not calculate it
     if (alloc->shouldRefresh())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::DumpAllocation - Allocation details not calculated yet, jitting info");
+            log->Printf("%s - allocation details not calculated yet, jitting info.", __FUNCTION__);
 
         // JIT all the allocation information
         if (!RefreshAllocation(alloc, frame_ptr))
@@ -2749,11 +2753,10 @@ RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame* frame_ptr, const u
     }
 
     // Establish format and size of each data element
-    const unsigned int vec_size = *alloc->element.type_vec_size.get();
+    const uint32_t vec_size = *alloc->element.type_vec_size.get();
     const Element::DataType type = *alloc->element.type.get();
 
-    assert(type >= Element::RS_TYPE_NONE && type <= Element::RS_TYPE_FONT
-                                                   && "Invalid allocation type");
+    assert(type >= Element::RS_TYPE_NONE && type <= Element::RS_TYPE_FONT && "Invalid allocation type");
 
     lldb::Format format;
     if (type >= Element::RS_TYPE_ELEMENT)
@@ -2762,10 +2765,10 @@ RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame* frame_ptr, const u
         format = vec_size == 1 ? static_cast<lldb::Format>(AllocationDetails::RSTypeToFormat[type][eFormatSingle])
                                : static_cast<lldb::Format>(AllocationDetails::RSTypeToFormat[type][eFormatVector]);
 
-    const unsigned int data_size = *alloc->element.datum_size.get();
+    const uint32_t data_size = *alloc->element.datum_size.get();
 
     if (log)
-        log->Printf("RenderScriptRuntime::DumpAllocation - Element size %u bytes, including padding", data_size);
+        log->Printf("%s - element size %" PRIu32 " bytes, including padding", __FUNCTION__, data_size);
 
     // Allocate a buffer to copy data into
     std::shared_ptr<uint8_t> buffer = GetAllocationData(alloc, frame_ptr);
@@ -2789,44 +2792,45 @@ RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame* frame_ptr, const u
             return false;
         }
     }
-    const unsigned int stride = *alloc->stride.get();
-    const unsigned int size = *alloc->size.get(); // Size of whole allocation
-    const unsigned int padding = alloc->element.padding.isValid() ? *alloc->element.padding.get() : 0;
+    const uint32_t stride = *alloc->stride.get();
+    const uint32_t size = *alloc->size.get(); // Size of whole allocation
+    const uint32_t padding = alloc->element.padding.isValid() ? *alloc->element.padding.get() : 0;
     if (log)
-        log->Printf("RenderScriptRuntime::DumpAllocation - stride %u bytes, size %u bytes, padding %u", stride, size, padding);
+        log->Printf("%s - stride %" PRIu32 " bytes, size %" PRIu32 " bytes, padding %" PRIu32,
+                    __FUNCTION__, stride, size, padding);
 
     // Find dimensions used to index loops, so need to be non-zero
-    unsigned int dim_x = alloc->dimension.get()->dim_1;
+    uint32_t dim_x = alloc->dimension.get()->dim_1;
     dim_x = dim_x == 0 ? 1 : dim_x;
 
-    unsigned int dim_y = alloc->dimension.get()->dim_2;
+    uint32_t dim_y = alloc->dimension.get()->dim_2;
     dim_y = dim_y == 0 ? 1 : dim_y;
 
-    unsigned int dim_z = alloc->dimension.get()->dim_3;
+    uint32_t dim_z = alloc->dimension.get()->dim_3;
     dim_z = dim_z == 0 ? 1 : dim_z;
 
     // Use data extractor to format output
     const uint32_t archByteSize = GetProcess()->GetTarget().GetArchitecture().GetAddressByteSize();
     DataExtractor alloc_data(buffer.get(), size, GetProcess()->GetByteOrder(), archByteSize);
 
-    unsigned int offset = 0;   // Offset in buffer to next element to be printed
-    unsigned int prev_row = 0; // Offset to the start of the previous row
+    uint32_t offset = 0;   // Offset in buffer to next element to be printed
+    uint32_t prev_row = 0; // Offset to the start of the previous row
 
     // Iterate over allocation dimensions, printing results to user
     strm.Printf("Data (X, Y, Z):");
-    for (unsigned int z = 0; z < dim_z; ++z)
+    for (uint32_t z = 0; z < dim_z; ++z)
     {
-        for (unsigned int y = 0; y < dim_y; ++y)
+        for (uint32_t y = 0; y < dim_y; ++y)
         {
             // Use stride to index start of next row.
-            if (!(y==0 && z==0))
+            if (!(y == 0 && z == 0))
                 offset = prev_row + stride;
             prev_row = offset;
 
             // Print each element in the row individually
-            for (unsigned int x = 0; x < dim_x; ++x)
+            for (uint32_t x = 0; x < dim_x; ++x)
             {
-                strm.Printf("\n(%u, %u, %u) = ", x, y, z);
+                strm.Printf("\n(%" PRIu32 ", %" PRIu32 ", %" PRIu32 ") = ", x, y, z);
                 if ((type == Element::RS_TYPE_NONE) && (alloc->element.children.size() > 0) &&
                     (alloc->element.type_name != Element::GetFallbackStructName()))
                 {
@@ -2841,12 +2845,12 @@ RenderScriptRuntime::DumpAllocation(Stream &strm, StackFrame* frame_ptr, const u
                     const int max_expr_size = 512;
                     char expr_char_buffer[max_expr_size];
                     int chars_written = snprintf(expr_char_buffer, max_expr_size, "*(%s*) 0x%" PRIx64,
-                                        alloc->element.type_name.AsCString(), *alloc->data_ptr.get() + offset);
+                                                 alloc->element.type_name.AsCString(), *alloc->data_ptr.get() + offset);
 
                     if (chars_written < 0 || chars_written >= max_expr_size)
                     {
                         if (log)
-                            log->Printf("RenderScriptRuntime::DumpAllocation- Error in snprintf()");
+                            log->Printf("%s - error in snprintf().", __FUNCTION__);
                         continue;
                     }
 
@@ -2889,11 +2893,13 @@ RenderScriptRuntime::ListAllocations(Stream &strm, StackFrame *frame_ptr, const
         // JIT current allocation information
         if (alloc->shouldRefresh() && !RefreshAllocation(alloc.get(), frame_ptr))
         {
-            strm.Printf("Error: Couldn't evaluate details for allocation %" PRIu32 "\n", alloc->id);
+            strm.Printf("Error: Couldn't evaluate details for allocation %" PRIu32, alloc->id);
+            strm.EOL();
             continue;
         }
 
-        strm.Printf("%u:\n",alloc->id);
+        strm.Printf("%" PRIu32 ":", alloc->id);
+        strm.EOL();
         strm.IndentMore();
 
         strm.Indent("Context: ");
@@ -2918,9 +2924,8 @@ RenderScriptRuntime::ListAllocations(Stream &strm, StackFrame *frame_ptr, const
         if (!alloc->dimension.isValid())
             strm.Printf("unknown\n");
         else
-            strm.Printf("(%d, %d, %d)\n", alloc->dimension.get()->dim_1,
-                                          alloc->dimension.get()->dim_2,
-                                          alloc->dimension.get()->dim_3);
+            strm.Printf("(%" PRId32 ", %" PRId32 ", %" PRId32 ")\n",
+                        alloc->dimension.get()->dim_1, alloc->dimension.get()->dim_2, alloc->dimension.get()->dim_3);
 
         strm.Indent("Data Type: ");
         if (!alloc->element.type.isValid() || !alloc->element.type_vec_size.isValid())
@@ -2936,13 +2941,16 @@ RenderScriptRuntime::ListAllocations(Stream &strm, StackFrame *frame_ptr, const
             {
                 // Enum value isn't monotonous, so doesn't always index RsDataTypeToString array
                 if (type >= Element::RS_TYPE_ELEMENT && type <= Element::RS_TYPE_FONT)
-                    type = static_cast<Element::DataType>((type - Element::RS_TYPE_ELEMENT) +  Element::RS_TYPE_MATRIX_2X2 + 1);
+                    type = static_cast<Element::DataType>((type - Element::RS_TYPE_ELEMENT) +
+                                                          Element::RS_TYPE_MATRIX_2X2 + 1);
 
-                if (type >= (sizeof(AllocationDetails::RsDataTypeToString) / sizeof(AllocationDetails::RsDataTypeToString[0]))
-                    || vector_size > 4 || vector_size < 1)
+                if (type >= (sizeof(AllocationDetails::RsDataTypeToString) /
+                             sizeof(AllocationDetails::RsDataTypeToString[0])) ||
+                    vector_size > 4 || vector_size < 1)
                     strm.Printf("invalid type\n");
                 else
-                    strm.Printf("%s\n", AllocationDetails::RsDataTypeToString[static_cast<unsigned int>(type)][vector_size-1]);
+                    strm.Printf("%s\n", AllocationDetails::RsDataTypeToString[static_cast<uint32_t>(type)]
+                                                                             [vector_size - 1]);
             }
         }
 
@@ -2955,7 +2963,7 @@ RenderScriptRuntime::ListAllocations(Stream &strm, StackFrame *frame_ptr, const
             if (kind < Element::RS_KIND_USER || kind > Element::RS_KIND_PIXEL_YUV)
                 strm.Printf("invalid kind\n");
             else
-                strm.Printf("%s\n", AllocationDetails::RsDataKindToString[static_cast<unsigned int>(kind)]);
+                strm.Printf("%s\n", AllocationDetails::RsDataKindToString[static_cast<uint32_t>(kind)]);
         }
 
         strm.EOL();
@@ -2986,7 +2994,7 @@ RenderScriptRuntime::BreakOnModuleKernels(const RSModuleDescriptorSP rsmodule_sp
 void
 RenderScriptRuntime::SetBreakAllKernels(bool do_break, TargetSP target)
 {
-    Log* log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_BREAKPOINTS));
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_BREAKPOINTS));
 
     InitSearchFilter(target);
 
@@ -2999,29 +3007,28 @@ RenderScriptRuntime::SetBreakAllKernels(bool do_break, TargetSP target)
             BreakOnModuleKernels(module);
 
         if (log)
-            log->Printf("RenderScriptRuntime::SetBreakAllKernels(True)"
-                        "- breakpoints set on all currently loaded kernels");
+            log->Printf("%s(True) - breakpoints set on all currently loaded kernels.", __FUNCTION__);
     }
     else if (!do_break && m_breakAllKernels) // Breakpoints won't be set on any new kernels.
     {
         m_breakAllKernels = false;
 
         if (log)
-            log->Printf("RenderScriptRuntime::SetBreakAllKernels(False) - breakpoints no longer automatically set");
+            log->Printf("%s(False) - breakpoints no longer automatically set.", __FUNCTION__);
     }
 }
 
 // Given the name of a kernel this function creates a breakpoint using our
 // own breakpoint resolver, and returns the Breakpoint shared pointer.
 BreakpointSP
-RenderScriptRuntime::CreateKernelBreakpoint(const ConstString& name)
+RenderScriptRuntime::CreateKernelBreakpoint(const ConstString &name)
 {
-    Log* log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_BREAKPOINTS));
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_BREAKPOINTS));
 
     if (!m_filtersp)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::CreateKernelBreakpoint - Error: No breakpoint search filter set");
+            log->Printf("%s - error, no breakpoint search filter set.", __FUNCTION__);
         return nullptr;
     }
 
@@ -3031,7 +3038,7 @@ RenderScriptRuntime::CreateKernelBreakpoint(const ConstString& name)
     // Give RS breakpoints a specific name, so the user can manipulate them as a group.
     Error err;
     if (!bp->AddName("RenderScriptKernel", err) && log)
-        log->Printf("RenderScriptRuntime::CreateKernelBreakpoint: Error setting break name, %s", err.AsCString());
+        log->Printf("%s - error setting break name, '%s'.", __FUNCTION__, err.AsCString());
 
     return bp;
 }
@@ -3040,35 +3047,31 @@ RenderScriptRuntime::CreateKernelBreakpoint(const ConstString& name)
 // If this is possible it returns true and sets the uint64_t parameter to the variables unsigned value.
 // Otherwise function returns false.
 bool
-RenderScriptRuntime::GetFrameVarAsUnsigned(const StackFrameSP frame_sp, const char* var_name, uint64_t& val)
+RenderScriptRuntime::GetFrameVarAsUnsigned(const StackFrameSP frame_sp, const char *var_name, uint64_t &val)
 {
-    Log* log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE));
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE));
     Error error;
     VariableSP var_sp;
 
     // Find variable in stack frame
-    ValueObjectSP value_sp(frame_sp->GetValueForVariableExpressionPath(var_name,
-                                                                       eNoDynamicValues,
-                                                                       StackFrame::eExpressionPathOptionCheckPtrVsMember |
-                                                                       StackFrame::eExpressionPathOptionsAllowDirectIVarAccess,
-                                                                       var_sp,
-                                                                       error));
+    ValueObjectSP value_sp(frame_sp->GetValueForVariableExpressionPath(
+        var_name, eNoDynamicValues,
+        StackFrame::eExpressionPathOptionCheckPtrVsMember | StackFrame::eExpressionPathOptionsAllowDirectIVarAccess,
+        var_sp, error));
     if (!error.Success())
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetFrameVarAsUnsigned - Error, couldn't find '%s' in frame", var_name);
-
+            log->Printf("%s - error, couldn't find '%s' in frame", __FUNCTION__, var_name);
         return false;
     }
 
-    // Find the unsigned int value for the variable
+    // Find the uint32_t value for the variable
     bool success = false;
     val = value_sp->GetValueAsUnsigned(0, &success);
     if (!success)
     {
         if (log)
-            log->Printf("RenderScriptRuntime::GetFrameVarAsUnsigned - Error, couldn't parse '%s' as an unsigned int", var_name);
-
+            log->Printf("%s - error, couldn't parse '%s' as an uint32_t.", __FUNCTION__, var_name);
         return false;
     }
 
@@ -3155,10 +3158,10 @@ RenderScriptRuntime::GetKernelCoordinate(RSCoordinate &coord, Thread *thread_ptr
 // Parameter 'break_loc_id' is the id for the BreakpointLocation which was hit,
 // a single logical breakpoint can have multiple addresses.
 bool
-RenderScriptRuntime::KernelBreakpointHit(void *baton, StoppointCallbackContext *ctx,
-                                         user_id_t break_id, user_id_t break_loc_id)
+RenderScriptRuntime::KernelBreakpointHit(void *baton, StoppointCallbackContext *ctx, user_id_t break_id,
+                                         user_id_t break_loc_id)
 {
-    Log* log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_BREAKPOINTS));
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_LANGUAGE | LIBLLDB_LOG_BREAKPOINTS));
 
     assert(baton && "Error: null baton in conditional kernel breakpoint callback");
 
@@ -3180,7 +3183,6 @@ RenderScriptRuntime::KernelBreakpointHit(void *baton, StoppointCallbackContext *
     {
         if (log)
             log->Printf("%s - Error, couldn't select .expand stack frame", __FUNCTION__);
-
         return false;
     }
 
@@ -3189,7 +3191,8 @@ RenderScriptRuntime::KernelBreakpointHit(void *baton, StoppointCallbackContext *
                     current_coord[2]);
 
     // Check if the current kernel invocation coordinate matches our target coordinate
-    if (current_coord[0] == target_coord[0] && current_coord[1] == target_coord[1] &&
+    if (current_coord[0] == target_coord[0] &&
+        current_coord[1] == target_coord[1] &&
         current_coord[2] == target_coord[2])
     {
         if (log)
@@ -3210,8 +3213,8 @@ RenderScriptRuntime::KernelBreakpointHit(void *baton, StoppointCallbackContext *
 // Argument 'coords', represents a three dimensional coordinate which can be used to specify
 // a single kernel instance to break on. If this is set then we add a callback to the breakpoint.
 void
-RenderScriptRuntime::PlaceBreakpointOnKernel(Stream &strm, const char* name, const std::array<int,3> coords,
-                                             Error& error, TargetSP target)
+RenderScriptRuntime::PlaceBreakpointOnKernel(Stream &strm, const char *name, const std::array<int, 3> coords,
+                                             Error &error, TargetSP target)
 {
     if (!name)
     {
@@ -3227,7 +3230,8 @@ RenderScriptRuntime::PlaceBreakpointOnKernel(Stream &strm, const char* name, con
     // We have a conditional breakpoint on a specific coordinate
     if (coords[0] != -1)
     {
-        strm.Printf("Conditional kernel breakpoint on coordinate %d, %d, %d", coords[0], coords[1], coords[2]);
+        strm.Printf("Conditional kernel breakpoint on coordinate %" PRId32 ", %" PRId32 ", %" PRId32,
+                    coords[0], coords[1], coords[2]);
         strm.EOL();
 
         // Allocate memory for the baton, and copy over coordinate
@@ -3259,10 +3263,10 @@ RenderScriptRuntime::DumpModules(Stream &strm) const
     strm.IndentLess();
 }
 
-RenderScriptRuntime::ScriptDetails*
+RenderScriptRuntime::ScriptDetails *
 RenderScriptRuntime::LookUpScript(addr_t address, bool create)
 {
-    for (const auto & s : m_scripts)
+    for (const auto &s : m_scripts)
     {
         if (s->script.isValid())
             if (*s->script == address)
@@ -3278,10 +3282,10 @@ RenderScriptRuntime::LookUpScript(addr_t address, bool create)
     return nullptr;
 }
 
-RenderScriptRuntime::AllocationDetails*
+RenderScriptRuntime::AllocationDetails *
 RenderScriptRuntime::LookUpAllocation(addr_t address, bool create)
 {
-    for (const auto & a : m_allocations)
+    for (const auto &a : m_allocations)
     {
         if (a->address.isValid())
             if (*a->address == address)
@@ -3302,7 +3306,7 @@ RSModuleDescriptor::Dump(Stream &strm) const
 {
     strm.Indent();
     m_module->GetFileSpec().Dump(&strm);
-    if(m_module->GetNumCompileUnits())
+    if (m_module->GetNumCompileUnits())
     {
         strm.Indent("Debug info loaded.");
     }
@@ -3329,7 +3333,7 @@ RSModuleDescriptor::Dump(Stream &strm) const
     {
         kernel.Dump(strm);
     }
-    strm.Printf("Pragmas: %"  PRIu64 , static_cast<uint64_t>(m_pragmas.size()));
+    strm.Printf("Pragmas: %" PRIu64, static_cast<uint64_t>(m_pragmas.size()));
     strm.EOL();
     strm.IndentMore();
     for (const auto &key_val : m_pragmas)
@@ -3350,7 +3354,7 @@ RSGlobalDescriptor::Dump(Stream &strm) const
     {
         auto var = var_list.GetVariableAtIndex(0);
         auto type = var->GetType();
-        if(type)
+        if (type)
         {
             strm.Printf(" - ");
             type->DumpTypeName(&strm);
@@ -3363,7 +3367,7 @@ RSGlobalDescriptor::Dump(Stream &strm) const
     else
     {
         strm.Printf(" - variable identified, but not found in binary");
-        const Symbol* s = m_module->m_module->FindFirstSymbolWithNameAndType(m_name, eSymbolTypeData);
+        const Symbol *s = m_module->m_module->FindFirstSymbolWithNameAndType(m_name, eSymbolTypeData);
         if (s)
         {
             strm.Printf(" (symbol exists) ");
@@ -3446,7 +3450,7 @@ class CommandObjectRenderScriptRuntimeModule : public CommandObjectMultiword
 public:
     CommandObjectRenderScriptRuntimeModule(CommandInterpreter &interpreter)
         : CommandObjectMultiword(interpreter, "renderscript module", "Commands that deal with renderscript modules.",
-                                 NULL)
+                                 nullptr)
     {
         LoadSubCommand("probe", CommandObjectSP(new CommandObjectRenderScriptRuntimeModuleProbe(interpreter)));
         LoadSubCommand("dump", CommandObjectSP(new CommandObjectRenderScriptRuntimeModuleDump(interpreter)));
@@ -3460,8 +3464,8 @@ class CommandObjectRenderScriptRuntimeKernelList : public CommandObjectParsed
 public:
     CommandObjectRenderScriptRuntimeKernelList(CommandInterpreter &interpreter)
         : CommandObjectParsed(interpreter, "renderscript kernel list",
-                              "Lists renderscript kernel names and associated script resources.", "renderscript kernel list",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched)
+                              "Lists renderscript kernel names and associated script resources.",
+                              "renderscript kernel list", eCommandRequiresProcess | eCommandProcessMustBeLaunched)
     {
     }
 
@@ -3483,14 +3487,16 @@ class CommandObjectRenderScriptRuntimeKernelBreakpointSet : public CommandObject
 public:
     CommandObjectRenderScriptRuntimeKernelBreakpointSet(CommandInterpreter &interpreter)
         : CommandObjectParsed(interpreter, "renderscript kernel breakpoint set",
-                              "Sets a breakpoint on a renderscript kernel.", "renderscript kernel breakpoint set <kernel_name> [-c x,y,z]",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched | eCommandProcessMustBePaused), m_options(interpreter)
+                              "Sets a breakpoint on a renderscript kernel.",
+                              "renderscript kernel breakpoint set <kernel_name> [-c x,y,z]",
+                              eCommandRequiresProcess | eCommandProcessMustBeLaunched | eCommandProcessMustBePaused),
+          m_options(interpreter)
     {
     }
 
     ~CommandObjectRenderScriptRuntimeKernelBreakpointSet() override = default;
 
-    Options*
+    Options *
     GetOptions() override
     {
         return &m_options;
@@ -3499,9 +3505,7 @@ public:
     class CommandOptions : public Options
     {
     public:
-        CommandOptions(CommandInterpreter &interpreter) : Options(interpreter)
-        {
-        }
+        CommandOptions(CommandInterpreter &interpreter) : Options(interpreter) {}
 
         ~CommandOptions() override = default;
 
@@ -3515,7 +3519,8 @@ public:
             {
                 case 'c':
                     if (!ParseCoordinate(option_arg))
-                        error.SetErrorStringWithFormat("Couldn't parse coordinate '%s', should be in format 'x,y,z'.", option_arg);
+                        error.SetErrorStringWithFormat("Couldn't parse coordinate '%s', should be in format 'x,y,z'.",
+                                                       option_arg);
                     break;
                 default:
                     error.SetErrorStringWithFormat("unrecognized option '%c'", short_option);
@@ -3528,23 +3533,23 @@ public:
         // Where 'id_cstr' is this argument with the whitespace trimmed.
         // Missing coordinates are defaulted to zero.
         bool
-        ParseCoordinate(const char* id_cstr)
+        ParseCoordinate(const char *id_cstr)
         {
             RegularExpression regex;
             RegularExpression::Match regex_match(3);
 
             bool matched = false;
-            if(regex.Compile("^([0-9]+),([0-9]+),([0-9]+)$") && regex.Execute(id_cstr, &regex_match))
+            if (regex.Compile("^([0-9]+),([0-9]+),([0-9]+)$") && regex.Execute(id_cstr, &regex_match))
                 matched = true;
-            else if(regex.Compile("^([0-9]+),([0-9]+)$") && regex.Execute(id_cstr, &regex_match))
+            else if (regex.Compile("^([0-9]+),([0-9]+)$") && regex.Execute(id_cstr, &regex_match))
                 matched = true;
-            else if(regex.Compile("^([0-9]+)$") && regex.Execute(id_cstr, &regex_match))
+            else if (regex.Compile("^([0-9]+)$") && regex.Execute(id_cstr, &regex_match))
                 matched = true;
-            for(uint32_t i = 0; i < 3; i++)
+            for (uint32_t i = 0; i < 3; i++)
             {
                 std::string group;
-                if(regex_match.GetMatchAtIndex(id_cstr, i + 1, group))
-                    m_coord[i] = (uint32_t)strtoul(group.c_str(), NULL, 0);
+                if (regex_match.GetMatchAtIndex(id_cstr, i + 1, group))
+                    m_coord[i] = (uint32_t)strtoul(group.c_str(), nullptr, 0);
                 else
                     m_coord[i] = 0;
             }
@@ -3560,14 +3565,14 @@ public:
             m_coord[2] = -1;
         }
 
-        const OptionDefinition*
+        const OptionDefinition *
         GetDefinitions() override
         {
             return g_option_table;
         }
 
         static OptionDefinition g_option_table[];
-        std::array<int,3> m_coord;
+        std::array<int, 3> m_coord;
     };
 
     bool
@@ -3576,13 +3581,14 @@ public:
         const size_t argc = command.GetArgumentCount();
         if (argc < 1)
         {
-            result.AppendErrorWithFormat("'%s' takes 1 argument of kernel name, and an optional coordinate.", m_cmd_name.c_str());
+            result.AppendErrorWithFormat("'%s' takes 1 argument of kernel name, and an optional coordinate.",
+                                         m_cmd_name.c_str());
             result.SetStatus(eReturnStatusFailed);
             return false;
         }
 
         RenderScriptRuntime *runtime =
-                (RenderScriptRuntime *)m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript);
+            (RenderScriptRuntime *)m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript);
 
         Error error;
         runtime->PlaceBreakpointOnKernel(result.GetOutputStream(), command.GetArgumentAtIndex(0), m_options.m_coord,
@@ -3603,26 +3609,24 @@ private:
     CommandOptions m_options;
 };
 
-OptionDefinition
-CommandObjectRenderScriptRuntimeKernelBreakpointSet::CommandOptions::g_option_table[] =
-{
-    { LLDB_OPT_SET_1, false, "coordinate", 'c', OptionParser::eRequiredArgument, NULL, NULL, 0, eArgTypeValue,
-      "Set a breakpoint on a single invocation of the kernel with specified coordinate.\n"
-      "Coordinate takes the form 'x[,y][,z] where x,y,z are positive integers representing kernel dimensions. "
-      "Any unset dimensions will be defaulted to zero."},
-    { 0, false, NULL, 0, 0, NULL, NULL, 0, eArgTypeNone, NULL }
-};
+OptionDefinition CommandObjectRenderScriptRuntimeKernelBreakpointSet::CommandOptions::g_option_table[] = {
+    {LLDB_OPT_SET_1, false, "coordinate", 'c', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeValue,
+     "Set a breakpoint on a single invocation of the kernel with specified coordinate.\n"
+     "Coordinate takes the form 'x[,y][,z] where x,y,z are positive integers representing kernel dimensions. "
+     "Any unset dimensions will be defaulted to zero."},
+    {0, false, nullptr, 0, 0, nullptr, nullptr, 0, eArgTypeNone, nullptr}};
 
 class CommandObjectRenderScriptRuntimeKernelBreakpointAll : public CommandObjectParsed
 {
 public:
     CommandObjectRenderScriptRuntimeKernelBreakpointAll(CommandInterpreter &interpreter)
-        : CommandObjectParsed(interpreter, "renderscript kernel breakpoint all",
-                              "Automatically sets a breakpoint on all renderscript kernels that are or will be loaded.\n"
-                              "Disabling option means breakpoints will no longer be set on any kernels loaded in the future, "
-                              "but does not remove currently set breakpoints.",
-                              "renderscript kernel breakpoint all <enable/disable>",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched | eCommandProcessMustBePaused)
+        : CommandObjectParsed(
+              interpreter, "renderscript kernel breakpoint all",
+              "Automatically sets a breakpoint on all renderscript kernels that are or will be loaded.\n"
+              "Disabling option means breakpoints will no longer be set on any kernels loaded in the future, "
+              "but does not remove currently set breakpoints.",
+              "renderscript kernel breakpoint all <enable/disable>",
+              eCommandRequiresProcess | eCommandProcessMustBeLaunched | eCommandProcessMustBePaused)
     {
     }
 
@@ -3639,11 +3643,11 @@ public:
             return false;
         }
 
-        RenderScriptRuntime *runtime =
-          static_cast<RenderScriptRuntime *>(m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
+        RenderScriptRuntime *runtime = static_cast<RenderScriptRuntime *>(
+            m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
 
         bool do_break = false;
-        const char* argument = command.GetArgumentAtIndex(0);
+        const char *argument = command.GetArgumentAtIndex(0);
         if (strcmp(argument, "enable") == 0)
         {
             do_break = true;
@@ -3708,8 +3712,8 @@ class CommandObjectRenderScriptRuntimeKernelBreakpoint : public CommandObjectMul
 {
 public:
     CommandObjectRenderScriptRuntimeKernelBreakpoint(CommandInterpreter &interpreter)
-        : CommandObjectMultiword(interpreter, "renderscript kernel", "Commands that generate breakpoints on renderscript kernels.",
-                                 nullptr)
+        : CommandObjectMultiword(interpreter, "renderscript kernel",
+                                 "Commands that generate breakpoints on renderscript kernels.", nullptr)
     {
         LoadSubCommand("set", CommandObjectSP(new CommandObjectRenderScriptRuntimeKernelBreakpointSet(interpreter)));
         LoadSubCommand("all", CommandObjectSP(new CommandObjectRenderScriptRuntimeKernelBreakpointAll(interpreter)));
@@ -3723,11 +3727,11 @@ class CommandObjectRenderScriptRuntimeKernel : public CommandObjectMultiword
 public:
     CommandObjectRenderScriptRuntimeKernel(CommandInterpreter &interpreter)
         : CommandObjectMultiword(interpreter, "renderscript kernel", "Commands that deal with renderscript kernels.",
-                                 NULL)
+                                 nullptr)
     {
         LoadSubCommand("list", CommandObjectSP(new CommandObjectRenderScriptRuntimeKernelList(interpreter)));
-        LoadSubCommand("breakpoint", CommandObjectSP(new CommandObjectRenderScriptRuntimeKernelBreakpoint(interpreter)));
-        LoadSubCommand("coordinate", CommandObjectSP(new CommandObjectRenderScriptRuntimeKernelCoordinate(interpreter)));
+        LoadSubCommand("breakpoint",
+                       CommandObjectSP(new CommandObjectRenderScriptRuntimeKernelBreakpoint(interpreter)));
     }
 
     ~CommandObjectRenderScriptRuntimeKernel() override = default;
@@ -3737,9 +3741,8 @@ class CommandObjectRenderScriptRuntimeContextDump : public CommandObjectParsed
 {
 public:
     CommandObjectRenderScriptRuntimeContextDump(CommandInterpreter &interpreter)
-        : CommandObjectParsed(interpreter, "renderscript context dump",
-                              "Dumps renderscript context information.", "renderscript context dump",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched)
+        : CommandObjectParsed(interpreter, "renderscript context dump", "Dumps renderscript context information.",
+                              "renderscript context dump", eCommandRequiresProcess | eCommandProcessMustBeLaunched)
     {
     }
 
@@ -3761,7 +3764,7 @@ class CommandObjectRenderScriptRuntimeContext : public CommandObjectMultiword
 public:
     CommandObjectRenderScriptRuntimeContext(CommandInterpreter &interpreter)
         : CommandObjectMultiword(interpreter, "renderscript context", "Commands that deal with renderscript contexts.",
-                                 NULL)
+                                 nullptr)
     {
         LoadSubCommand("dump", CommandObjectSP(new CommandObjectRenderScriptRuntimeContextDump(interpreter)));
     }
@@ -3775,13 +3778,14 @@ public:
     CommandObjectRenderScriptRuntimeAllocationDump(CommandInterpreter &interpreter)
         : CommandObjectParsed(interpreter, "renderscript allocation dump",
                               "Displays the contents of a particular allocation", "renderscript allocation dump <ID>",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched), m_options(interpreter)
+                              eCommandRequiresProcess | eCommandProcessMustBeLaunched),
+          m_options(interpreter)
     {
     }
 
     ~CommandObjectRenderScriptRuntimeAllocationDump() override = default;
 
-    Options*
+    Options *
     GetOptions() override
     {
         return &m_options;
@@ -3790,9 +3794,7 @@ public:
     class CommandOptions : public Options
     {
     public:
-        CommandOptions(CommandInterpreter &interpreter) : Options(interpreter)
-        {
-        }
+        CommandOptions(CommandInterpreter &interpreter) : Options(interpreter) {}
 
         ~CommandOptions() override = default;
 
@@ -3825,7 +3827,7 @@ public:
             m_outfile.Clear();
         }
 
-        const OptionDefinition*
+        const OptionDefinition *
         GetDefinitions() override
         {
             return g_option_table;
@@ -3847,10 +3849,10 @@ public:
             return false;
         }
 
-        RenderScriptRuntime *runtime =
-          static_cast<RenderScriptRuntime *>(m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
+        RenderScriptRuntime *runtime = static_cast<RenderScriptRuntime *>(
+            m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
 
-        const char* id_cstr = command.GetArgumentAtIndex(0);
+        const char *id_cstr = command.GetArgumentAtIndex(0);
         bool convert_complete = false;
         const uint32_t id = StringConvert::ToUInt32(id_cstr, UINT32_MAX, 0, &convert_complete);
         if (!convert_complete)
@@ -3860,7 +3862,7 @@ public:
             return false;
         }
 
-        Stream* output_strm = nullptr;
+        Stream *output_strm = nullptr;
         StreamFile outfile_stream;
         const FileSpec &outfile_spec = m_options.m_outfile; // Dump allocation to file instead
         if (outfile_spec)
@@ -3899,13 +3901,10 @@ private:
     CommandOptions m_options;
 };
 
-OptionDefinition
-CommandObjectRenderScriptRuntimeAllocationDump::CommandOptions::g_option_table[] =
-{
-    { LLDB_OPT_SET_1, false, "file", 'f', OptionParser::eRequiredArgument, NULL, NULL, 0, eArgTypeFilename,
-      "Print results to specified file instead of command line."},
-    { 0, false, NULL, 0, 0, NULL, NULL, 0, eArgTypeNone, NULL }
-};
+OptionDefinition CommandObjectRenderScriptRuntimeAllocationDump::CommandOptions::g_option_table[] = {
+    {LLDB_OPT_SET_1, false, "file", 'f', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeFilename,
+     "Print results to specified file instead of command line."},
+    {0, false, nullptr, 0, 0, nullptr, nullptr, 0, eArgTypeNone, nullptr}};
 
 class CommandObjectRenderScriptRuntimeAllocationList : public CommandObjectParsed
 {
@@ -3913,13 +3912,14 @@ public:
     CommandObjectRenderScriptRuntimeAllocationList(CommandInterpreter &interpreter)
         : CommandObjectParsed(interpreter, "renderscript allocation list",
                               "List renderscript allocations and their information.", "renderscript allocation list",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched), m_options(interpreter)
+                              eCommandRequiresProcess | eCommandProcessMustBeLaunched),
+          m_options(interpreter)
     {
     }
 
     ~CommandObjectRenderScriptRuntimeAllocationList() override = default;
 
-    Options*
+    Options *
     GetOptions() override
     {
         return &m_options;
@@ -3959,7 +3959,7 @@ public:
             m_id = 0;
         }
 
-        const OptionDefinition*
+        const OptionDefinition *
         GetDefinitions() override
         {
             return g_option_table;
@@ -3972,8 +3972,8 @@ public:
     bool
     DoExecute(Args &command, CommandReturnObject &result) override
     {
-        RenderScriptRuntime *runtime =
-          static_cast<RenderScriptRuntime *>(m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
+        RenderScriptRuntime *runtime = static_cast<RenderScriptRuntime *>(
+            m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
         runtime->ListAllocations(result.GetOutputStream(), m_exe_ctx.GetFramePtr(), m_options.m_id);
         result.SetStatus(eReturnStatusSuccessFinishResult);
         return true;
@@ -3984,17 +3984,17 @@ private:
 };
 
 OptionDefinition CommandObjectRenderScriptRuntimeAllocationList::CommandOptions::g_option_table[] = {
-    {LLDB_OPT_SET_1, false, "id", 'i', OptionParser::eRequiredArgument, NULL, NULL, 0, eArgTypeIndex,
+    {LLDB_OPT_SET_1, false, "id", 'i', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeIndex,
      "Only show details of a single allocation with specified id."},
-    {0, false, NULL, 0, 0, NULL, NULL, 0, eArgTypeNone, NULL}};
+    {0, false, nullptr, 0, 0, nullptr, nullptr, 0, eArgTypeNone, nullptr}};
 
 class CommandObjectRenderScriptRuntimeAllocationLoad : public CommandObjectParsed
 {
 public:
     CommandObjectRenderScriptRuntimeAllocationLoad(CommandInterpreter &interpreter)
-        : CommandObjectParsed(interpreter, "renderscript allocation load",
-                              "Loads renderscript allocation contents from a file.", "renderscript allocation load <ID> <filename>",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched)
+        : CommandObjectParsed(
+              interpreter, "renderscript allocation load", "Loads renderscript allocation contents from a file.",
+              "renderscript allocation load <ID> <filename>", eCommandRequiresProcess | eCommandProcessMustBeLaunched)
     {
     }
 
@@ -4006,25 +4006,26 @@ public:
         const size_t argc = command.GetArgumentCount();
         if (argc != 2)
         {
-            result.AppendErrorWithFormat("'%s' takes 2 arguments, an allocation ID and filename to read from.", m_cmd_name.c_str());
+            result.AppendErrorWithFormat("'%s' takes 2 arguments, an allocation ID and filename to read from.",
+                                         m_cmd_name.c_str());
             result.SetStatus(eReturnStatusFailed);
             return false;
         }
 
-        RenderScriptRuntime *runtime =
-          static_cast<RenderScriptRuntime *>(m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
+        RenderScriptRuntime *runtime = static_cast<RenderScriptRuntime *>(
+            m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
 
-        const char* id_cstr = command.GetArgumentAtIndex(0);
+        const char *id_cstr = command.GetArgumentAtIndex(0);
         bool convert_complete = false;
         const uint32_t id = StringConvert::ToUInt32(id_cstr, UINT32_MAX, 0, &convert_complete);
         if (!convert_complete)
         {
-            result.AppendErrorWithFormat ("invalid allocation id argument '%s'", id_cstr);
-            result.SetStatus (eReturnStatusFailed);
+            result.AppendErrorWithFormat("invalid allocation id argument '%s'", id_cstr);
+            result.SetStatus(eReturnStatusFailed);
             return false;
         }
 
-        const char* filename = command.GetArgumentAtIndex(1);
+        const char *filename = command.GetArgumentAtIndex(1);
         bool success = runtime->LoadAllocation(result.GetOutputStream(), id, filename, m_exe_ctx.GetFramePtr());
 
         if (success)
@@ -4040,9 +4041,9 @@ class CommandObjectRenderScriptRuntimeAllocationSave : public CommandObjectParse
 {
 public:
     CommandObjectRenderScriptRuntimeAllocationSave(CommandInterpreter &interpreter)
-        : CommandObjectParsed(interpreter, "renderscript allocation save",
-                              "Write renderscript allocation contents to a file.", "renderscript allocation save <ID> <filename>",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched)
+        : CommandObjectParsed(
+              interpreter, "renderscript allocation save", "Write renderscript allocation contents to a file.",
+              "renderscript allocation save <ID> <filename>", eCommandRequiresProcess | eCommandProcessMustBeLaunched)
     {
     }
 
@@ -4054,25 +4055,26 @@ public:
         const size_t argc = command.GetArgumentCount();
         if (argc != 2)
         {
-            result.AppendErrorWithFormat("'%s' takes 2 arguments, an allocation ID and filename to read from.", m_cmd_name.c_str());
+            result.AppendErrorWithFormat("'%s' takes 2 arguments, an allocation ID and filename to read from.",
+                                         m_cmd_name.c_str());
             result.SetStatus(eReturnStatusFailed);
             return false;
         }
 
-        RenderScriptRuntime *runtime =
-          static_cast<RenderScriptRuntime *>(m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
+        RenderScriptRuntime *runtime = static_cast<RenderScriptRuntime *>(
+            m_exe_ctx.GetProcessPtr()->GetLanguageRuntime(eLanguageTypeExtRenderScript));
 
-        const char* id_cstr = command.GetArgumentAtIndex(0);
+        const char *id_cstr = command.GetArgumentAtIndex(0);
         bool convert_complete = false;
         const uint32_t id = StringConvert::ToUInt32(id_cstr, UINT32_MAX, 0, &convert_complete);
         if (!convert_complete)
         {
-            result.AppendErrorWithFormat ("invalid allocation id argument '%s'", id_cstr);
-            result.SetStatus (eReturnStatusFailed);
+            result.AppendErrorWithFormat("invalid allocation id argument '%s'", id_cstr);
+            result.SetStatus(eReturnStatusFailed);
             return false;
         }
 
-        const char* filename = command.GetArgumentAtIndex(1);
+        const char *filename = command.GetArgumentAtIndex(1);
         bool success = runtime->SaveAllocation(result.GetOutputStream(), id, filename, m_exe_ctx.GetFramePtr());
 
         if (success)
@@ -4088,8 +4090,8 @@ class CommandObjectRenderScriptRuntimeAllocation : public CommandObjectMultiword
 {
 public:
     CommandObjectRenderScriptRuntimeAllocation(CommandInterpreter &interpreter)
-        : CommandObjectMultiword(interpreter, "renderscript allocation", "Commands that deal with renderscript allocations.",
-                                 NULL)
+        : CommandObjectMultiword(interpreter, "renderscript allocation",
+                                 "Commands that deal with renderscript allocations.", nullptr)
     {
         LoadSubCommand("list", CommandObjectSP(new CommandObjectRenderScriptRuntimeAllocationList(interpreter)));
         LoadSubCommand("dump", CommandObjectSP(new CommandObjectRenderScriptRuntimeAllocationDump(interpreter)));
@@ -4104,9 +4106,8 @@ class CommandObjectRenderScriptRuntimeStatus : public CommandObjectParsed
 {
 public:
     CommandObjectRenderScriptRuntimeStatus(CommandInterpreter &interpreter)
-        : CommandObjectParsed(interpreter, "renderscript status",
-                              "Displays current renderscript runtime status.", "renderscript status",
-                              eCommandRequiresProcess | eCommandProcessMustBeLaunched)
+        : CommandObjectParsed(interpreter, "renderscript status", "Displays current renderscript runtime status.",
+                              "renderscript status", eCommandRequiresProcess | eCommandProcessMustBeLaunched)
     {
     }
 
@@ -4147,17 +4148,19 @@ RenderScriptRuntime::Initiate()
 }
 
 RenderScriptRuntime::RenderScriptRuntime(Process *process)
-    : lldb_private::CPPLanguageRuntime(process), m_initiated(false), m_debuggerPresentFlagged(false),
+    : lldb_private::CPPLanguageRuntime(process),
+      m_initiated(false),
+      m_debuggerPresentFlagged(false),
       m_breakAllKernels(false)
 {
     ModulesDidLoad(process->GetTarget().GetImages());
 }
 
 lldb::CommandObjectSP
-RenderScriptRuntime::GetCommandObject(lldb_private::CommandInterpreter& interpreter)
+RenderScriptRuntime::GetCommandObject(lldb_private::CommandInterpreter &interpreter)
 {
     static CommandObjectSP command_object;
-    if(!command_object)
+    if (!command_object)
     {
         command_object.reset(new CommandObjectRenderScriptRuntime(interpreter));
     }